aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
authorStefan Monnier2011-03-31 00:24:03 -0400
committerStefan Monnier2011-03-31 00:24:03 -0400
commit40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch)
treeb56f27a7e6d75a8c1fd27b00179a27b5efea0a32 /src/menu.c
parentf488fb6528738131ef41859e1f04125f2e50efce (diff)
parent44f230aa043ebb222aa0876b44d70484d5dd38db (diff)
downloademacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz
emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip
Merge from trunk
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/menu.c b/src/menu.c
index 851f1ac804b..a9098deed7e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -662,13 +662,12 @@ digest_single_submenu (int start, int end, int top_level_items)
662 else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) 662 else if (EQ (XVECTOR (menu_items)->contents[i], Qt))
663 { 663 {
664 /* Create a new pane. */ 664 /* Create a new pane. */
665 Lisp_Object pane_name, prefix; 665 Lisp_Object pane_name;
666 const char *pane_string; 666 const char *pane_string;
667 667
668 panes_seen++; 668 panes_seen++;
669 669
670 pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; 670 pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME];
671 prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
672 671
673#ifdef HAVE_NTGUI 672#ifdef HAVE_NTGUI
674 if (STRINGP (pane_name)) 673 if (STRINGP (pane_name))