merge from trunk

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 @@
+2013-08-26  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_initialize): Set gtk-menu-bar-accel to "" instead
+        of VoidSymbol (Bug#15154).
+
 2013-08-26  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * 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)
                                           (gdk_display_get_default ()));
   /* Remove F10 as a menu accelerator, it does not mix well with Emacs key
      bindings.  It doesn't seem to be any way to remove properties,
-     so we set it to VoidSymbol which in X means "no key".  */
+     so we set it to "" which in means "no key".  */
   gtk_settings_set_string_property (settings,
                                     "gtk-menu-bar-accel",
-                                    "VoidSymbol",
+                                    "",
                                     EMACS_CLASS);
 
   /* Make GTK text input widgets use Emacs style keybindings.  This is