Mercurial > emacs
diff src/xmenu.c @ 83423:b64b7e867d0a
Merged from miles@gnu.org--gnu-2005 (patch 677)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-677
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-463
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 26 Dec 2005 03:16:59 +0000 |
| parents | 14a4eb789b45 7ae48da37b8f |
| children | d0eee3282e6b |
line wrap: on
line diff
--- a/src/xmenu.c Mon Dec 26 02:21:31 2005 +0000 +++ b/src/xmenu.c Mon Dec 26 03:16:59 2005 +0000 @@ -905,8 +905,11 @@ if (! FRAME_X_P (f)) error ("Can not put X menu on non-X terminal"); + + XSETFRAME (Vmenu_updating_frame, f); } - Vmenu_updating_frame = Qnil; + else + Vmenu_updating_frame = Qnil; #endif /* HAVE_MENUS */ record_unwind_protect (unuse_menu_items, Qnil);