# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 948292741 0
# Node ID 56c304580b798ac81e200c39c0dfd7bf65753936
# Parent  0c0628ca5029fe8a882213ef8502da7dedba8685
(command-line): Check for compiled user-init-file and
set to uncompiled version if necessary.

diff -r 0c0628ca5029 -r 56c304580b79 lisp/startup.el
--- a/lisp/startup.el	Wed Jan 19 14:25:26 2000 +0000
+++ b/lisp/startup.el	Wed Jan 19 14:39:01 2000 +0000
@@ -178,7 +178,7 @@
 
 ;;; This is here, rather than in x-win.el, so that we can ignore these
 ;;; options when we are not using X.
-(defvar command-line-x-option-alist
+(defconst command-line-x-option-alist
   '(("-bw" 1 x-handle-numeric-switch border-width)
     ("-d" 1 x-handle-display)
     ("-display" 1 x-handle-display)
@@ -677,6 +677,17 @@
 		    ;; don't let it be set from default.el.
 		    (if (eq user-init-file t)
 			(setq user-init-file nil))
+		    ;; If we loaded a compiled file, set
+		    ;; `user-init-file' to the source version if that
+		    ;; exists.
+		    (if (and user-init-file
+			     (equal (file-name-extension user-init-file)
+				    "elc"))
+			(let ((el (concat (file-name-sans-extension
+					   user-init-file)
+					  ".el")))
+			  (if (file-exists-p el)
+			      (setq user-init-file el))))
 		    (or inhibit-default-init
 			(let ((inhibit-startup-message nil))
 			  ;; Users are supposed to be told their rights.
@@ -764,12 +775,12 @@
   ;; If -batch, terminate after processing the command options.
   (if noninteractive (kill-emacs t)))
 
-(defcustom initial-scratch-message "\
+(defcustom initial-scratch-message (purecopy "\
 ;; This buffer is for notes you don't want to save, and for Lisp evaluation.
 ;; If you want to create a file, visit that file with C-x C-f,
 ;; then enter the text in that file's own buffer.
 
-"
+")
   "Initial message displayed in *scratch* buffer at startup.
 If this is nil, no message will be displayed."
   :type 'string)