[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103670: Add warning for obsolete _em
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103670: Add warning for obsolete _emacs init file. |
Date: |
Wed, 16 Mar 2011 03:13:31 +0100 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103670
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2011-03-16 03:13:31 +0100
message:
Add warning for obsolete _emacs init file.
* lisp/startup.el (command-line): Warn the user that _emacs is deprecated.
* etc/NEWS: Document warning about _emacs.
modified:
etc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/startup.el
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog 2011-03-14 14:13:40 +0000
+++ b/etc/ChangeLog 2011-03-16 02:13:31 +0000
@@ -1,3 +1,7 @@
+2011-03-16 Juanma Barranquero <address@hidden>
+
+ * NEWS: Document warning about _emacs.
+
2011-03-14 Michael Albinus <address@hidden>
* NEWS: `shell' prompts for the shell path name, when the default
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2011-03-14 14:13:40 +0000
+++ b/etc/NEWS 2011-03-16 02:13:31 +0000
@@ -62,6 +62,8 @@
** 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
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-03-16 01:28:20 +0000
+++ b/lisp/ChangeLog 2011-03-16 02:13:31 +0000
@@ -1,5 +1,9 @@
2011-03-16 Juanma Barranquero <address@hidden>
+ * startup.el (command-line): Warn the user that _emacs is deprecated.
+
+2011-03-16 Juanma Barranquero <address@hidden>
+
* progmodes/delphi.el (delphi-search-path, delphi-indent-level)
(delphi-verbose, delphi-comment-face, delphi-string-face)
(delphi-keyword-face, delphi-ignore-changes, delphi-indent-line)
=== modified file 'lisp/startup.el'
--- a/lisp/startup.el 2011-03-15 16:21:30 +0000
+++ b/lisp/startup.el 2011-03-16 02:13:31 +0000
@@ -1006,19 +1006,23 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103670: Add warning for obsolete _emacs init file.,
Juanma Barranquero <=