# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1134364491 0
# Node ID f69aa26e69fdbb7308480cf9ab1f7be7b488540e
# Parent  71747d29feb077d73fb8c040dfdad0239102d123
(inhibit-splash-screen): Make this the real name.
(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.

diff -r 71747d29feb0 -r f69aa26e69fd lisp/startup.el
--- a/lisp/startup.el	Mon Dec 12 05:12:46 2005 +0000
+++ b/lisp/startup.el	Mon Dec 12 05:14:51 2005 +0000
@@ -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))