[Emacs-diffs] /srv/bzr/emacs/trunk r110841: * lisp/subr.el (locate-user-emacs-file): If both old and new name exist, use

[Stefan Monnier]

------------------------------------------------------------
revno: 110841
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-08 14:45:58 -0500
message:
  * lisp/subr.el (locate-user-emacs-file): If both old and new name exist, use
  the new name.
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-08 19:44:52 +0000
+++ b/lisp/ChangeLog    2012-11-08 19:45:58 +0000
@@ -1,5 +1,8 @@
 2012-11-08  Stefan Monnier  <address@hidden>
 
+       * subr.el (locate-user-emacs-file): If both old and new name exist, use
+       the new name.
+
        * progmodes/js.el (js--filling-paragraph): New var.
        (c-forward-sws, c-backward-sws, c-beginning-of-macro): Advise.
        (js-c-fill-paragraph): Prefer advice to cl-letf so the rebinding is

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-10-27 05:03:52 +0000
+++ b/lisp/subr.el      2012-11-08 19:45:58 +0000
@@ -2657,13 +2657,17 @@
 
 (defun locate-user-emacs-file (new-name &optional old-name)
   "Return an absolute per-user Emacs-specific file name.
-If OLD-NAME is non-nil and ~/OLD-NAME exists, return ~/OLD-NAME.
+If NEW-NAME exists in `user-emacs-directory', return it.
+Else If OLD-NAME is non-nil and ~/OLD-NAME exists, return ~/OLD-NAME.
 Else return NEW-NAME in `user-emacs-directory', creating the
 directory if it does not exist."
   (convert-standard-filename
    (let* ((home (concat "~" (or init-file-user "")))
-         (at-home (and old-name (expand-file-name old-name home))))
-     (if (and at-home (file-readable-p at-home))
+         (at-home (and old-name (expand-file-name old-name home)))
+          (bestname (abbreviate-file-name
+                     (expand-file-name new-name user-emacs-directory))))
+     (if (and at-home (not (file-readable-p bestname))
+              (file-readable-p at-home))
         at-home
        ;; Make sure `user-emacs-directory' exists,
        ;; unless we're in batch mode or dumping Emacs
@@ -2677,8 +2681,7 @@
                   (set-default-file-modes ?\700)
                   (make-directory user-emacs-directory))
               (set-default-file-modes umask))))
-       (abbreviate-file-name
-        (expand-file-name new-name user-emacs-directory))))))
+       bestname))))
 
 ;;;; Misc. useful functions.