Mercurial > emacs
diff lisp/startup.el @ 83385:1cd4072747c6
Merged from miles@gnu.org--gnu-2005 (patch 593-595)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-593
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-594
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-595
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-425
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Wed, 19 Oct 2005 14:03:44 +0000 |
| parents | 08b4dd6a6e87 9a0d9cf10142 |
| children | 0181341f0aca |
line wrap: on
line diff
--- a/lisp/startup.el Wed Oct 12 16:14:04 2005 +0000 +++ b/lisp/startup.el Wed Oct 19 14:03:44 2005 +0000 @@ -128,7 +128,7 @@ ("-bg" 1 x-handle-switch background-color) ("-background" 1 x-handle-switch background-color) ("-ms" 1 x-handle-switch mouse-color) - ("-nb" 0 x-handle-switch icon-type nil) + ("-nbi" 0 x-handle-switch icon-type nil) ("-iconic" 0 x-handle-iconic) ("-xrm" 1 x-handle-xrm-switch) ("-cr" 1 x-handle-switch cursor-color) @@ -1232,7 +1232,13 @@ the user caused an input event by hitting a key or clicking with the mouse." (interactive) - (push last-command-event unread-command-events) + (if (and (consp last-command-event) + (eq (posn-window (event-start last-command-event)) + (selected-window))) + ;; This is a mouse-down event in the spash screen window. + ;; Ignore it and consume the corresponding mouse-up event. + (read-event) + (push last-command-event unread-command-events)) (throw 'exit nil))