From 30f83e30932f2b0f523b66e5dcf1b8fec54ec1f7 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 3 Jul 2023 08:56:21 +0800 Subject: [PATCH] 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. --- src/frame.c | 13 +++++++++++++ src/keyboard.c | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/frame.c b/src/frame.c index 8ac62b284a0..83925d4742a 100644 --- 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 e0182057b39..b61b1766856 100644 --- 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 -- 2.39.2