aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
authorStefan Monnier2012-03-25 16:37:21 -0400
committerStefan Monnier2012-03-25 16:37:21 -0400
commit699c782b7668c44d0fa4446331b0590a6d5dac82 (patch)
tree5dcce364741d0761920a3d274b0fc8aba4103d45 /src/menu.c
parent98fb480ee31bf74cf554044f60f21df16566dd7f (diff)
parente99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff)
downloademacs-pending.tar.gz
emacs-pending.zip
Merge from trunkpending
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/menu.c b/src/menu.c
index fa31c8a51c1..df86208c7ef 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,6 +1,6 @@
1/* Platform-independent code for terminal communications. 1/* Platform-independent code for terminal communications.
2 2
3Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2011 3Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2012
4 Free Software Foundation, Inc. 4 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
@@ -364,7 +364,7 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk
364 return; 364 return;
365 } 365 }
366 366
367#if defined(HAVE_X_WINDOWS) || defined(MSDOS) 367#if defined (HAVE_X_WINDOWS) || defined (MSDOS)
368#ifndef HAVE_BOXES 368#ifndef HAVE_BOXES
369 /* Simulate radio buttons and toggle boxes by putting a prefix in 369 /* Simulate radio buttons and toggle boxes by putting a prefix in
370 front of them. */ 370 front of them. */
@@ -977,7 +977,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
977 prefix = entry = Qnil; 977 prefix = entry = Qnil;
978 i = 0; 978 i = 0;
979 subprefix_stack = 979 subprefix_stack =
980 (Lisp_Object *)alloca(menu_items_used * sizeof (Lisp_Object)); 980 (Lisp_Object *)alloca (menu_items_used * sizeof (Lisp_Object));
981 981
982 while (i < menu_items_used) 982 while (i < menu_items_used)
983 { 983 {