Mercurial > emacs
diff lisp/menu-bar.el @ 90105:7e3f621f1dd4
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-15
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-95
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
Move Gnus images into etc/images
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-97
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-105
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-14
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
Update from CVS: lisp/imap.el (imap-log): Doc fix.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-16
Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 18 Feb 2005 00:41:50 +0000 |
parents | f2ebccfa87d4 798f4c8b5626 |
children | 29e773288013 |
line wrap: on
line diff
--- a/lisp/menu-bar.el Mon Feb 14 03:40:07 2005 +0000 +++ b/lisp/menu-bar.el Fri Feb 18 00:41:50 2005 +0000 @@ -1515,9 +1515,11 @@ (dolist (f (frame-list)) (when (equal last-command-event (frame-parameter f 'name)) (setq frame f))) - (make-frame-visible frame) - (raise-frame frame) - (select-frame frame))) + ;; FRAME can be nil when user specifies the selected frame. + (setq frame (or frame (selected-frame))) + (make-frame-visible frame) + (raise-frame frame) + (select-frame frame))) (defun menu-bar-update-buffers-1 (elt) (let* ((buf (car elt))