Update to new DEFSYM strategy

Update to new DEFSYM strategy which was slightly tricky.

4 files changed, 5 insertions, 30 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 86c840d052a..6afbd5d5fb8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11102,8 +11102,7 @@ syms_of_keyboard (void)
 #endif
 
 #ifdef HAVE_XWIDGETS
-  Qxwidget_event = intern ("xwidget-event");
-  staticpro (&Qxwidget_event);
+  DEFSYM (Qxwidget_event,"xwidget-event");
 #endif /* HAVE_XWIDGETS */
 #ifdef USE_FILE_NOTIFY
   DEFSYM (Qfile_notify, "file-notify");
diff --git a/src/print.c b/src/print.c
index 963979e809a..688327dfe1c 100644
--- a/src/print.c
+++ b/src/print.c
@@ -40,13 +40,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef HAVE_XWIDGETS
 #include "xwidget.h"
 #endif
-Lisp_Object Qstandard_output;
-
-static Lisp_Object Qtemp_buffer_setup_hook;
-
-/* These are used to print like we read.  */
-
-static Lisp_Object Qfloat_output_format;
 
 #include <float.h>
 #include <ftoastr.h>
diff --git a/src/xwidget.c b/src/xwidget.c
index fc4ec80bef9..00913ca634c 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -113,23 +113,6 @@ allocate_xwidget_view (void)
 #define XSETXWIDGET(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_XWIDGET))
 #define XSETXWIDGET_VIEW(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_XWIDGET_VIEW))
 
-Lisp_Object Qxwidget;
-Lisp_Object QCxwidget;
-Lisp_Object QCtitle;
-Lisp_Object Qxwidget_set_keyboard_grab;
-Lisp_Object Qxwidget_embed_steal_window;
-Lisp_Object Qxwidget_info;
-Lisp_Object Qxwidget_resize;
-Lisp_Object Qxwidget_send_keyboard_event;
-Lisp_Object QCxwgir_class;
-Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qsocket_osr, Qcairo, Qxwgir,
-  Qwebkit_osr, QCplist;
-Lisp_Object Qxwidgetp, Qxwidget_view_p;
-
-
-extern Lisp_Object  QCtype;
-extern Lisp_Object QCwidth, QCheight;
-
 struct xwidget_view* xwidget_view_lookup(struct xwidget* xw,     struct window *w);
 Lisp_Object xwidget_spec_value ( Lisp_Object spec, Lisp_Object  key,  int *found);
 gboolean offscreen_damage_event (GtkWidget *widget, GdkEvent *event, gpointer data);
@@ -1564,12 +1547,12 @@ syms_of_xwidget (void)
   defsubr (&Sset_xwidget_query_on_exit_flag);
   defsubr (&Sset_frame_visible);
 
-#ifdef HAVE_WEBKIT_OSR
+  #ifdef HAVE_WEBKIT_OSR
   defsubr (&Sxwidget_webkit_goto_uri);
   defsubr (&Sxwidget_webkit_execute_script);
   defsubr (&Sxwidget_webkit_get_title);
-  DEFSYM (Qwebkit_osr ,"webkit-osr");
-#endif
+  DEFSYM (Qwebkit_osr, "webkit-osr");
+  #endif
 
   defsubr (&Sxwgir_xwidget_call_method  );
   defsubr (&Sxwgir_require_namespace);
diff --git a/src/xwidget.h b/src/xwidget.h
index 6f3f4bb0449..0db7653941b 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -4,7 +4,7 @@
 void x_draw_xwidget_glyph_string (struct glyph_string *s);
 void syms_of_xwidget ();
 
-extern Lisp_Object Qxwidget;
+//extern Lisp_Object Qxwidget;
 
 
 int valid_xwidget_spec_p (Lisp_Object object) ;