Mercurial > emacs
diff lisp/startup.el @ 83404:69e184bbba16
Merged from miles@gnu.org--gnu-2005 (patch 656-658)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-656
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-658
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-444
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Wed, 23 Nov 2005 01:35:21 +0000 |
| parents | 03934708f1e9 8d65a4f81b32 |
| children | 14a4eb789b45 |
line wrap: on
line diff
--- a/lisp/startup.el Sat Nov 19 19:17:56 2005 +0000 +++ b/lisp/startup.el Wed Nov 23 01:35:21 2005 +0000 @@ -653,7 +653,7 @@ (if (and (stringp (car elt)) (not (file-name-absolute-p (car elt)))) (cons (locate-file (car elt) load-path - load-suffixes) + (append load-suffixes '(""))) (cdr elt)) elt)) load-history)) @@ -1285,7 +1285,7 @@ the user caused an input event by hitting a key or clicking with the mouse." (interactive) - (if (and (consp last-command-event) + (if (and (memq 'down (event-modifiers last-command-event)) (eq (posn-window (event-start last-command-event)) (selected-window))) ;; This is a mouse-down event in the spash screen window.