[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108133: load-path-shadows-font-lock-keywords tweak

[Glenn Morris]

------------------------------------------------------------
revno: 108133
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-09-11 00:13:21 -0700
message:
  load-path-shadows-font-lock-keywords tweak
  
  * lisp/emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords):
  Be more robust about locating simple.el.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/shadow.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-10 02:19:23 +0000
+++ b/lisp/ChangeLog    2012-09-11 07:13:21 +0000
@@ -1,3 +1,8 @@
+2012-09-11  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords):
+       Be more robust about locating simple.el.
+
 2012-09-10  Glenn Morris  <address@hidden>
 
        * mail/emacsbug.el (report-emacs-bug): Trap load-path-shadows errors.

=== modified file 'lisp/emacs-lisp/shadow.el'
--- a/lisp/emacs-lisp/shadow.el 2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/shadow.el 2012-09-11 07:13:21 +0000
@@ -158,8 +158,14 @@
                      (eq 0 (call-process "cmp" nil nil nil "-s" f1 f2))))))))
 
 (defvar load-path-shadows-font-lock-keywords
+  ;; The idea is that shadows of files supplied with Emacs are more
+  ;; serious than various versions of external packages shadowing each
+  ;; other.
   `((,(format "hides \\(%s.*\\)"
-             (file-name-directory (locate-library "simple.el")))
+             (file-name-directory
+              (or (locate-library "simple")
+                  (file-name-as-directory
+                   (expand-file-name "../lisp" data-directory)))))
      . (1 font-lock-warning-face)))
   "Keywords to highlight in `load-path-shadows-mode'.")