[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el |
Date: |
Mon, 12 Dec 2005 05:14:51 +0000 |
Index: emacs/lisp/startup.el
diff -u emacs/lisp/startup.el:1.390 emacs/lisp/startup.el:1.391
--- emacs/lisp/startup.el:1.390 Tue Nov 22 03:32:50 2005
+++ emacs/lisp/startup.el Mon Dec 12 05:14:51 2005
@@ -40,14 +40,14 @@
"Emacs start-up procedure."
:group 'internal)
-(defcustom inhibit-startup-message nil
- "*Non-nil inhibits the initial startup message.
+(defcustom inhibit-splash-screen nil
+ "*Non-nil inhibits the startup screen.
This is for use in your personal init file, once you are familiar
-with the contents of the startup message."
+with the contents of the startup screen."
:type 'boolean
:group 'initialization)
-(defvaralias 'inhibit-splash-screen 'inhibit-startup-message)
+(defvaralias 'inhibit-startup-message 'inhibit-splash-screen)
(defcustom inhibit-startup-echo-area-message nil
"*Non-nil inhibits the initial startup echo area message.
@@ -642,15 +642,22 @@
(set-locale-environment nil)
;; Convert preloaded file names to absolute.
- (setq load-history
- (mapcar (lambda (elt)
- (if (and (stringp (car elt))
- (not (file-name-absolute-p (car elt))))
- (cons (locate-file (car elt) load-path
- (append load-suffixes '("")))
- (cdr elt))
- elt))
- load-history))
+ (let ((lisp-dir
+ (file-name-directory
+ (locate-file "simple" load-path
+ load-suffixes))))
+
+ (setq load-history
+ (mapcar (lambda (elt)
+ (if (and (stringp (car elt))
+ (not (file-name-absolute-p (car elt))))
+ (cons (concat lisp-dir
+ (car elt)
+ (if (string-match "[.]el$" (car elt))
+ "" ".elc"))
+ (cdr elt))
+ elt))
+ load-history)))
;; Convert the arguments to Emacs internal representation.
(let ((args (cdr command-line-args)))
@@ -923,6 +930,10 @@
(pop-to-buffer "*Messages*"))
(setq init-file-had-error t)))))
+ (if (and deactivate-mark transient-mark-mode)
+ (with-current-buffer (window-buffer)
+ (deactivate-mark)))
+
;; If the user has a file of abbrevs, read it.
(if (file-exists-p abbrev-file-name)
(quietly-read-abbrev-file abbrev-file-name))
- [Emacs-diffs] Changes to emacs/lisp/startup.el,
Richard M. Stallman <=