Always provide `move-toolbar' when its position can be changed

* src/keyboard.c (syms_of_keyboard): Make `move-toolbar' a
defsym.  Provide that feature if Emacs uses its internal tool
bars or GTK+.
* src/xfns.c (syms_of_xfns): Stop provide `move-toolbar' here.

2 files changed, 12 insertions, 1 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index b61b1766856..74e30d111db 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12793,6 +12793,18 @@ See also `pre-command-hook'.  */);
 
   DEFSYM (Qcoding, "coding");
 
+#ifdef HAVE_WINDOW_SYSTEM
+  DEFSYM (Qmove_toolbar, "move-toolbar");
+
+  /* The `tool-bar-position' 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
diff --git a/src/xfns.c b/src/xfns.c
index a58e854811b..5c9f58e3a96 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -10456,7 +10456,6 @@ eliminated in future versions of Emacs.  */);
      accepts --with-x-toolkit=gtk.  */
   Fprovide (intern_c_string ("x-toolkit"), Qnil);
   Fprovide (intern_c_string ("gtk"), Qnil);
-  Fprovide (intern_c_string ("move-toolbar"), Qnil);
 
   DEFVAR_LISP ("gtk-version-string", Vgtk_version_string,
                doc: /* Version info for GTK+.  */);