procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add warning for obsolete _emacs init file.

Browse source 
* lisp/startup.el (command-line): Warn the user that _emacs is deprecated.
* etc/NEWS: Document warning about _emacs.
This commit is contained in:
Juanma Barranquero 2011-03-16 03:13:31 +01:00
parent 5ba5fb816d
commit 8a05b6681e
4 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/ChangeLog
View file

@ -1,3 +1,7 @@
2011-03-16 Juanma Barranquero <lekktu@gmail.com>
* NEWS: Document warning about _emacs.
2011-03-14 Michael Albinus <michael.albinus@gmx.de>
* NEWS: `shell' prompts for the shell path name, when the default

2
etc/NEWS
View file

@ -62,6 +62,8 @@ longer have any effect. (They were declared obsolete in Emacs 23.)
** New command line option `--no-site-lisp' removes site-lisp directories
from load-path. -Q now implies this.
** On Windows, Emacs now warns when the obsolete _emacs init file is used.
* Changes in Emacs 24.1

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2011-03-16 Juanma Barranquero <lekktu@gmail.com>
* startup.el (command-line): Warn the user that _emacs is deprecated.
2011-03-16 Juanma Barranquero <lekktu@gmail.com>
* progmodes/delphi.el (delphi-search-path, delphi-indent-level)

30
lisp/startup.el
View file

@ -1006,19 +1006,23 @@ opening the first frame (e.g. open a connection to an X server).")
(if init-file-user
(let ((user-init-file-1
(cond
((eq system-type 'ms-dos)
(concat "~" init-file-user "/_emacs"))
((eq system-type 'windows-nt)
;; Prefer .emacs on Windows.
(if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
"~/.emacs"
;; Also support _emacs for compatibility.
(if (directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
"~/_emacs"
;; But default to .emacs if _emacs does not exist.
"~/.emacs")))
(t
(concat "~" init-file-user "/.emacs")))))
((eq system-type 'ms-dos)
(concat "~" init-file-user "/_emacs"))
((not (eq system-type 'windows-nt))
(concat "~" init-file-user "/.emacs"))
;; Else deal with the Windows situation
((directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
;; Prefer .emacs on Windows.
"~/.emacs")
((directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
;; Also support _emacs for compatibility, but warn about it.
(display-warning
'initialization
"`_emacs' init file is deprecated, please use `.emacs'"
:warning)
"~/_emacs")
(t ;; But default to .emacs if _emacs does not exist.
"~/.emacs"))))
;; This tells `load' to store the file name found
;; into user-init-file.
(setq user-init-file t)