[Emacs-diffs] trunk r118038: * lisp/startup.el (command-line): Handle altered user-emacs-directory

[Glenn Morris]

------------------------------------------------------------
revno: 118038
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18512
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-10-04 11:58:41 -0700
message:
  * lisp/startup.el (command-line): Handle altered user-emacs-directory
  in load-path warning.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/startup.el                startup.el-20091113204419-o5vbwnq5f7feedwu-260

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-04 08:20:24 +0000
+++ b/lisp/ChangeLog    2014-10-04 18:58:41 +0000
@@ -1,3 +1,8 @@
+2014-10-04  Glenn Morris  <address@hidden>
+
+       * startup.el (command-line):
+       Handle altered user-emacs-directory in load-path warning.  (Bug#18512)
+
 2014-10-04  Martin Rudalics  <address@hidden>
 
        * window.el (window-full-height-p): Make it behave correctly for

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2014-10-02 13:26:23 +0000
+++ b/lisp/startup.el   2014-10-04 18:58:41 +0000
@@ -1286,7 +1286,11 @@
   (let (warned)
     (dolist (dir load-path)
       (and (not warned)
-          (string-match-p "/[._]emacs\\.d/?\\'" dir)
+          (string-match-p
+           (format "/%s/?\\'"
+                   (regexp-quote
+                    (file-name-nondirectory
+                     (directory-file-name user-emacs-directory)))) dir)
           (string-equal (file-name-as-directory (expand-file-name dir))
                         (expand-file-name user-emacs-directory))
           (setq warned t)