diff options
| author | Po Lu | 2023-07-03 08:56:21 +0800 |
|---|---|---|
| committer | Po Lu | 2023-07-03 08:56:21 +0800 |
| commit | 30f83e30932f2b0f523b66e5dcf1b8fec54ec1f7 (patch) | |
| tree | c2b8decee4848e18baf0685b02e91d595bb705e6 /src | |
| parent | 3a07511f1bacafca57a825fdab885f0a24577595 (diff) | |
| download | emacs-30f83e30932f2b0f523b66e5dcf1b8fec54ec1f7.tar.gz emacs-30f83e30932f2b0f523b66e5dcf1b8fec54ec1f7.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 13 | ||||
| -rw-r--r-- | 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. */); | |||
| 6809 | defsubr (&Sx_parse_geometry); | 6809 | defsubr (&Sx_parse_geometry); |
| 6810 | defsubr (&Sreconsider_frame_fonts); | 6810 | defsubr (&Sreconsider_frame_fonts); |
| 6811 | #endif | 6811 | #endif |
| 6812 | |||
| 6813 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 6814 | DEFSYM (Qmove_toolbar, "move-toolbar"); | ||
| 6815 | |||
| 6816 | /* The `tool-bar-position' frame parameter is supported on GTK and | ||
| 6817 | builds using the internal tool bar. Providing this feature | ||
| 6818 | causes menu-bar.el to provide `tool-bar-position' as a user | ||
| 6819 | option. */ | ||
| 6820 | |||
| 6821 | #if !defined HAVE_EXT_TOOL_BAR || defined USE_GTK | ||
| 6822 | Fprovide (Qmove_toolbar, Qnil); | ||
| 6823 | #endif /* !HAVE_EXT_TOOL_BAR || USE_GTK */ | ||
| 6824 | #endif /* HAVE_WINDOW_SYSTEM */ | ||
| 6812 | } | 6825 | } |
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'. */); | |||
| 12793 | 12793 | ||
| 12794 | DEFSYM (Qcoding, "coding"); | 12794 | DEFSYM (Qcoding, "coding"); |
| 12795 | 12795 | ||
| 12796 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 12797 | DEFSYM (Qmove_toolbar, "move-toolbar"); | ||
| 12798 | |||
| 12799 | /* The `tool-bar-position' frame parameter is supported on GTK and | ||
| 12800 | builds using the internal tool bar. Providing this feature | ||
| 12801 | causes menu-bar.el to provide `tool-bar-position' as a user | ||
| 12802 | option. */ | ||
| 12803 | |||
| 12804 | #if !defined HAVE_EXT_TOOL_BAR || defined USE_GTK | ||
| 12805 | Fprovide (Qmove_toolbar, Qnil); | ||
| 12806 | #endif /* !HAVE_EXT_TOOL_BAR || USE_GTK */ | ||
| 12807 | #endif /* HAVE_WINDOW_SYSTEM */ | ||
| 12808 | |||
| 12809 | Fset (Qecho_area_clear_hook, Qnil); | 12796 | Fset (Qecho_area_clear_hook, Qnil); |
| 12810 | 12797 | ||
| 12811 | #ifdef USE_LUCID | 12798 | #ifdef USE_LUCID |