diff options
| author | Jan Djärv | 2013-08-26 17:44:56 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-08-26 17:44:56 +0200 |
| commit | efec3894b2c9ace7de0545d5bb20685cd4140253 (patch) | |
| tree | 6502f89bacffa686254768f5b36faba73721032a /src | |
| parent | a8544941cffd259022729a7a7905582c63050031 (diff) | |
| download | emacs-efec3894b2c9ace7de0545d5bb20685cd4140253.tar.gz emacs-efec3894b2c9ace7de0545d5bb20685cd4140253.zip | |
* gtkutil.c (xg_initialize): Set gtk-menu-bar-accel to "" instead
of VoidSymbol.
Fixes: debbugs:15154
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gtkutil.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a065a91d32b..5f0bb86c3ee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-26 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * gtkutil.c (xg_initialize): Set gtk-menu-bar-accel to "" instead | ||
| 4 | of VoidSymbol (Bug#15154). | ||
| 5 | |||
| 1 | 2013-08-26 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2013-08-26 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | * lisp.h (Mouse_HLInfo): Drop set-but-unused members | 8 | * lisp.h (Mouse_HLInfo): Drop set-but-unused members |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 8e255ac4bfb..0f3f5ba58ba 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -5044,10 +5044,10 @@ xg_initialize (void) | |||
| 5044 | (gdk_display_get_default ())); | 5044 | (gdk_display_get_default ())); |
| 5045 | /* Remove F10 as a menu accelerator, it does not mix well with Emacs key | 5045 | /* Remove F10 as a menu accelerator, it does not mix well with Emacs key |
| 5046 | bindings. It doesn't seem to be any way to remove properties, | 5046 | bindings. It doesn't seem to be any way to remove properties, |
| 5047 | so we set it to VoidSymbol which in X means "no key". */ | 5047 | so we set it to "" which in means "no key". */ |
| 5048 | gtk_settings_set_string_property (settings, | 5048 | gtk_settings_set_string_property (settings, |
| 5049 | "gtk-menu-bar-accel", | 5049 | "gtk-menu-bar-accel", |
| 5050 | "VoidSymbol", | 5050 | "", |
| 5051 | EMACS_CLASS); | 5051 | EMACS_CLASS); |
| 5052 | 5052 | ||
| 5053 | /* Make GTK text input widgets use Emacs style keybindings. This is | 5053 | /* Make GTK text input widgets use Emacs style keybindings. This is |