diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-09-11 00:13:21 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-09-11 00:13:21 -0700 |
| commit | 511fd0b2f470a33bf7f3d101ab03fcf47b797218 (patch) | |
| tree | 0743ed0fc590c60f32109944f209e32ef92fb75c /lisp | |
| parent | fa05bfe0525d75bde4c94c3cbbd90c5fa7a5a7dc (diff) | |
| download | emacs-511fd0b2f470a33bf7f3d101ab03fcf47b797218.tar.gz | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5d0d00be9dc..b448f30e5e3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-09-11 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords): + Be more robust about locating simple.el. + 2012-09-10 Glenn Morris <rgm@gnu.org> * mail/emacsbug.el (report-emacs-bug): Trap load-path-shadows errors. diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 286c4937b5b..bceec296ad8 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -158,8 +158,14 @@ See the documentation for `list-load-path-shadows' for further information." (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'.") |