Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-266
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-267
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-268
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-269
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-270
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-271
   Rename "field-at-point" to "field-at-pos"

 * emacs@sv.gnu.org/emacs--devo--0--patch-272
   (comint-insert-input): Remove redundant calls to setq and goto-char

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-556

1 files changed, 2 insertions, 0 deletions

diff --git a/src/macmenu.c b/src/macmenu.c
index be565f89259..e7d69d5657c 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -318,6 +318,7 @@ restore_menu_items (saved)
   menu_items_n_panes = XINT (XCAR (saved));
   saved = XCDR (saved);  
   menu_items_submenu_depth = XINT (XCAR (saved));
+  return Qnil;
 }
 
 /* Push the whole state of menu_items processing onto the specpdl.
@@ -634,6 +635,7 @@ cleanup_popup_menu (arg)
      Lisp_Object arg;
 {
   discard_menu_items ();
+  return Qnil;
 }
 
 DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,