diff options
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 3853ba4fe80..184a2424756 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -263,9 +263,9 @@ init file is read, in case it sets `mail-host-address'." (defcustom auto-save-list-file-prefix (cond ((eq system-type 'ms-dos) ;; MS-DOS cannot have initial dot, and allows only 8.3 names - "~/_emacs.d/auto-save.list/_s") + (concat user-emacs-directory "auto-save.list/_s")) (t - "~/.emacs.d/auto-save-list/.saves-")) + (concat user-emacs-directory "auto-save-list/.saves-"))) "Prefix for generating `auto-save-list-file-name'. This is used after reading your `.emacs' file to initialize `auto-save-list-file-name', by appending Emacs's pid and the system name, @@ -1055,7 +1055,10 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." (if (get-buffer "*scratch*") (with-current-buffer "*scratch*" (if (eq major-mode 'fundamental-mode) - (funcall initial-major-mode)))) + (funcall initial-major-mode)) + ;; Don't lose text that users type in *scratch*. + (setq buffer-offer-save t) + (auto-save-mode 1))) ;; Load library for our terminal type. ;; User init file can set term-file-prefix to nil to prevent this. @@ -1311,7 +1314,7 @@ using the mouse.\n\n") (emacs-version) "\n" :face '(variable-pitch :height 0.5) - "Copyright (C) 2007 Free Software Foundation, Inc.") + emacs-copyright) (and auto-save-list-file-prefix ;; Don't signal an error if the ;; directory for auto-save-list files @@ -1560,8 +1563,7 @@ Getting New Versions How to obtain the latest version of Emacs More Manuals / Ordering Manuals How to order printed manuals from the FSF ") (insert "\n\n" (emacs-version) - " -Copyright (C) 2007 Free Software Foundation, Inc.")) + "\n" emacs-copyright)) ;; No mouse menus, so give help using kbd commands. @@ -1608,8 +1610,7 @@ Activate menubar \\[tmm-menubar]"))) If you have no Meta key, you may instead type ESC followed by the character.)") (insert "\n\n" (emacs-version) - " -Copyright (C) 2007 Free Software Foundation, Inc.") + "\n" emacs-copyright) (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) (eq (key-binding "\C-h\C-d") 'describe-distribution) |