comparison 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
comparison
equal deleted inserted replaced
83403:51eb0aa362f3 83404:69e184bbba16
651 (setq load-history 651 (setq load-history
652 (mapcar (lambda (elt) 652 (mapcar (lambda (elt)
653 (if (and (stringp (car elt)) 653 (if (and (stringp (car elt))
654 (not (file-name-absolute-p (car elt)))) 654 (not (file-name-absolute-p (car elt))))
655 (cons (locate-file (car elt) load-path 655 (cons (locate-file (car elt) load-path
656 load-suffixes) 656 (append load-suffixes '("")))
657 (cdr elt)) 657 (cdr elt))
658 elt)) 658 elt))
659 load-history)) 659 load-history))
660 660
661 ;; Convert the arguments to Emacs internal representation. 661 ;; Convert the arguments to Emacs internal representation.
1283 "Stop displaying the splash screen buffer. 1283 "Stop displaying the splash screen buffer.
1284 This is an internal function used to turn off the splash screen after 1284 This is an internal function used to turn off the splash screen after
1285 the user caused an input event by hitting a key or clicking with the 1285 the user caused an input event by hitting a key or clicking with the
1286 mouse." 1286 mouse."
1287 (interactive) 1287 (interactive)
1288 (if (and (consp last-command-event) 1288 (if (and (memq 'down (event-modifiers last-command-event))
1289 (eq (posn-window (event-start last-command-event)) 1289 (eq (posn-window (event-start last-command-event))
1290 (selected-window))) 1290 (selected-window)))
1291 ;; This is a mouse-down event in the spash screen window. 1291 ;; This is a mouse-down event in the spash screen window.
1292 ;; Ignore it and consume the corresponding mouse-up event. 1292 ;; Ignore it and consume the corresponding mouse-up event.
1293 (read-event) 1293 (read-event)