Provide move-toolbar in a more appropriate place

* src/frame.c (syms_of_frame): Provide `move-toolbar' here...
* src/keyboard.c (syms_of_keyboard): ..instead of here.

diff --git a/src/frame.c b/src/frame.c
index 8ac62b284a00e00e16c169b395da23bafef4735f..83925d4742a22fc0c43cb3d1c7cf0818b46f4b9b 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -6809,4 +6809,17 @@ iconify the top level frame instead.  */);
   defsubr (&Sx_parse_geometry);
   defsubr (&Sreconsider_frame_fonts);
 #endif
+
+#ifdef HAVE_WINDOW_SYSTEM
+  DEFSYM (Qmove_toolbar, "move-toolbar");
+
+  /* The `tool-bar-position' frame parameter is supported on GTK and
+     builds using the internal tool bar.  Providing this feature
+     causes menu-bar.el to provide `tool-bar-position' as a user
+     option.  */
+
+#if !defined HAVE_EXT_TOOL_BAR || defined USE_GTK
+  Fprovide (Qmove_toolbar, Qnil);
+#endif /* !HAVE_EXT_TOOL_BAR || USE_GTK */
+#endif /* HAVE_WINDOW_SYSTEM */
 }

diff --git a/src/keyboard.c b/src/keyboard.c
index e0182057b39326d96b20a32f01ba3fd1f261cc17..b61b1766856d3b9c4bc4b2bd9076d163247c81d7 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12793,19 +12793,6 @@ See also `pre-command-hook'.  */);
 
   DEFSYM (Qcoding, "coding");
 
-#ifdef HAVE_WINDOW_SYSTEM
-  DEFSYM (Qmove_toolbar, "move-toolbar");
-
-  /* The `tool-bar-position' frame parameter is supported on GTK and
-     builds using the internal tool bar.  Providing this feature
-     causes menu-bar.el to provide `tool-bar-position' as a user
-     option.  */
-
-#if !defined HAVE_EXT_TOOL_BAR || defined USE_GTK
-  Fprovide (Qmove_toolbar, Qnil);
-#endif /* !HAVE_EXT_TOOL_BAR || USE_GTK */
-#endif /* HAVE_WINDOW_SYSTEM */
-
   Fset (Qecho_area_clear_hook, Qnil);
 
 #ifdef USE_LUCID