diff lisp/startup.el @ 83414:14a4eb789b45

Merged from [e-mail]--gnu-2005 (patch 169-173, 671-676) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-671 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-672 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-673 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-674 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-675 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-676 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-169 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-170 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-171 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-172 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-173 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-454

--- a/lisp/startup.el	Mon Dec 19 16:13:20 2005 +0000
+++ b/lisp/startup.el	Mon Dec 19 19:57:22 2005 +0000
@@ -47,14 +47,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.
@@ -648,15 +648,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)))
@@ -930,6 +937,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))