mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-28 10:56:36 +00:00
Code Issues Releases Activity

(inhibit-splash-screen): Make this the real name.

Browse Source 
(inhibit-startup-message): Make this the alias.
(command-line): Find only simple.el, and use its directory
to fill in other preloaded files' names.
(command-line): Deactivate the mark if deactivate-mark is set.
This commit is contained in:
Richard M. Stallman 2005-12-12 05:14:51 +00:00
parent e2328c7a51
commit 9c8b215040
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lisp/startup.el
View File

@ -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 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(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 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(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))