diff options
| author | Karoly Lorentey | 2005-12-26 03:16:59 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-12-26 03:16:59 +0000 |
| commit | feba0cd6405ebb80af743e2f978442d9c837bcd2 (patch) | |
| tree | 1cb964aa641bee514d9cda2eafe27a0a97e65ad1 /src/macmenu.c | |
| parent | 30663b475e57197c9896a252e1d4ca31c579fa2b (diff) | |
| parent | 7a32e81fb608282314e27db21a00138aaa91f29a (diff) | |
| download | emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.tar.gz emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.zip | |
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
Diffstat (limited to 'src/macmenu.c')
| -rw-r--r-- | src/macmenu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index a68ff04e405..064cec57486 100644 --- a/src/macmenu.c +++ b/src/macmenu.c | |||
| @@ -746,7 +746,8 @@ no quit occurs and `x-popup-menu' returns nil. */) | |||
| 746 | 746 | ||
| 747 | XSETFRAME (Vmenu_updating_frame, f); | 747 | XSETFRAME (Vmenu_updating_frame, f); |
| 748 | } | 748 | } |
| 749 | Vmenu_updating_frame = Qnil; | 749 | else |
| 750 | Vmenu_updating_frame = Qnil; | ||
| 750 | #endif /* HAVE_MENUS */ | 751 | #endif /* HAVE_MENUS */ |
| 751 | 752 | ||
| 752 | title = Qnil; | 753 | title = Qnil; |