diff options
author | Richard M. Stallman <rms@gnu.org> | 1997-09-14 17:27:48 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 1997-09-14 17:27:48 +0000 |
commit | 790e112e28b62c32d4f457673febb5b2dab398da (patch) | |
tree | 3710d2c7a9a7f5f01b50353f2ea36a21364b2433 | |
parent | 75cb7bbdd25d7538bff20f3a19d43a40b80ecf79 (diff) | |
download | emacs-790e112e28b62c32d4f457673febb5b2dab398da.tar.gz |
(normal-top-level-add-to-load-path):
Try looking for the unmodified default-directory in load-path.
(initial-scratch-message): New variable.
(command-line-1): Use initial-scratch-message.
-rw-r--r-- | lisp/startup.el | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 72ab648f318..ebae4140132 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -334,7 +334,8 @@ from being initialized." ;; This function is called from the subdirs.el file. (defun normal-top-level-add-to-load-path (dirs) - (let ((tail (member (directory-file-name default-directory) load-path))) + (let ((tail (or (member (directory-file-name default-directory) load-path) + (member default-directory load-path)))) (setcdr tail (append (mapcar 'expand-file-name dirs) (cdr tail))))) (defun normal-top-level () @@ -671,6 +672,16 @@ from being initialized." ;; If -batch, terminate after processing the command options. (if noninteractive (kill-emacs t))) +(defcustom initial-scratch-message "\ +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) + (defun command-line-1 (command-line-args-left) (or noninteractive (input-pending-p) init-file-had-error (and inhibit-startup-echo-area-message @@ -820,13 +831,8 @@ Type \\[describe-distribution] for information on getting the latest version.")) (sit-for 120)) (with-current-buffer (get-buffer "*scratch*") (erase-buffer) - (insert "\ -If you want to create a file, don't type the text in this buffer. -This buffer is for notes you don't want to save, and for Lisp evaluation. -If you want to create a file, first visit that file with C-x C-f, -then enter the text in that file's own buffer. - -") + (and initial-scratch-message + (insert initial-scratch-message)) (set-buffer-modified-p nil))))))) ;; Delay 2 seconds after the init file error message ;; was displayed, so user can read it. |