Mercurial > emacs

comparison lisp/startup.el @ 83414:14a4eb789b45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 169-173, 671-676) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-671 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-672 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-673 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-674 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-675 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-169 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-170 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-171 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-172 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-173 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-454
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 19 Dec 2005 19:57:22 +0000
parents 69e184bbba16 f69aa26e69fd
children 4513d8dcdfd5
comparison
equal deleted inserted replaced
83413:e26e2265dcc6 83414:14a4eb789b45
45 45
46 (defgroup initialization nil 46 (defgroup initialization nil
47 "Emacs start-up procedure." 47 "Emacs start-up procedure."
48 :group 'internal) 48 :group 'internal)
49 49
50 (defcustom inhibit-startup-message nil 50 (defcustom inhibit-splash-screen nil
51 "*Non-nil inhibits the initial startup message. 51 "*Non-nil inhibits the startup screen.
52 This is for use in your personal init file, once you are familiar 52 This is for use in your personal init file, once you are familiar
53 with the contents of the startup message." 53 with the contents of the startup screen."
54 :type 'boolean 54 :type 'boolean
55 :group 'initialization) 55 :group 'initialization)
56 56
57 (defvaralias 'inhibit-splash-screen 'inhibit-startup-message) 57 (defvaralias 'inhibit-startup-message 'inhibit-splash-screen)
58 58
59 (defcustom inhibit-startup-echo-area-message nil 59 (defcustom inhibit-startup-echo-area-message nil
60 "*Non-nil inhibits the initial startup echo area message. 60 "*Non-nil inhibits the initial startup echo area message.
61 Setting this variable takes effect 61 Setting this variable takes effect
62 only if you do it with the customization buffer 62 only if you do it with the customization buffer
646 (kill-emacs))) 646 (kill-emacs)))
647 647
648 (set-locale-environment nil) 648 (set-locale-environment nil)
649 649
650 ;; Convert preloaded file names to absolute. 650 ;; Convert preloaded file names to absolute.
651 (setq load-history 651 (let ((lisp-dir
652 (mapcar (lambda (elt) 652 (file-name-directory
653 (if (and (stringp (car elt)) 653 (locate-file "simple" load-path
654 (not (file-name-absolute-p (car elt)))) 654 load-suffixes))))
655 (cons (locate-file (car elt) load-path 655
656 (append load-suffixes '(""))) 656 (setq load-history
657 (cdr elt)) 657 (mapcar (lambda (elt)
658 elt)) 658 (if (and (stringp (car elt))
659 load-history)) 659 (not (file-name-absolute-p (car elt))))
660 (cons (concat lisp-dir
661 (car elt)
662 (if (string-match "[.]el$" (car elt))
663 "" ".elc"))
664 (cdr elt))
665 elt))
666 load-history)))
660 667
661 ;; Convert the arguments to Emacs internal representation. 668 ;; Convert the arguments to Emacs internal representation.
662 (let ((args (cdr command-line-args))) 669 (let ((args (cdr command-line-args)))
663 (while args 670 (while args
664 (setcar args 671 (setcar args
928 (mapconcat 'prin1-to-string (cdr error) ", ")) 935 (mapconcat 'prin1-to-string (cdr error) ", "))
929 (let ((pop-up-windows nil)) 936 (let ((pop-up-windows nil))
930 (pop-to-buffer "*Messages*")) 937 (pop-to-buffer "*Messages*"))
931 (setq init-file-had-error t))))) 938 (setq init-file-had-error t)))))
932 939
940 (if (and deactivate-mark transient-mark-mode)
941 (with-current-buffer (window-buffer)
942 (deactivate-mark)))
943
933 ;; If the user has a file of abbrevs, read it. 944 ;; If the user has a file of abbrevs, read it.
934 (if (file-exists-p abbrev-file-name) 945 (if (file-exists-p abbrev-file-name)
935 (quietly-read-abbrev-file abbrev-file-name)) 946 (quietly-read-abbrev-file abbrev-file-name))
936 947
937 ;; If the abbrevs came entirely from the init file or the 948 ;; If the abbrevs came entirely from the init file or the