Mercurial > emacs

comparison src/xmenu.c @ 83423:b64b7e867d0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
83422:1f5d64c4df6f 83423:b64b7e867d0a
903 xpos += XINT (x); 903 xpos += XINT (x);
904 ypos += XINT (y); 904 ypos += XINT (y);
905 905
906 if (! FRAME_X_P (f)) 906 if (! FRAME_X_P (f))
907 error ("Can not put X menu on non-X terminal"); 907 error ("Can not put X menu on non-X terminal");
908 } 908
909 Vmenu_updating_frame = Qnil; 909 XSETFRAME (Vmenu_updating_frame, f);
910 }
911 else
912 Vmenu_updating_frame = Qnil;
910 #endif /* HAVE_MENUS */ 913 #endif /* HAVE_MENUS */
911 914
912 record_unwind_protect (unuse_menu_items, Qnil); 915 record_unwind_protect (unuse_menu_items, Qnil);
913 title = Qnil; 916 title = Qnil;
914 GCPRO1 (title); 917 GCPRO1 (title);