diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-09-21 11:03:48 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-09-21 11:03:48 +0800 |
| commit | acfa068f4a1a4652b784af1d7aaac92929399249 (patch) | |
| tree | 4d5aef916164ae9862e4c94f50a5e53bbe274e53 /lisp/emacs-lisp | |
| parent | eb2deaffd17e760b3ec945c58d43080e8a44767a (diff) | |
| parent | d3fa327c47570a1767324d23d710504e90b083f9 (diff) | |
| download | emacs-acfa068f4a1a4652b784af1d7aaac92929399249.tar.gz | |
Merge from emacs-24; up to 2012-05-07T14:57:18Z!michael.albinus@gmx.de
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 8 |
1 files changed, 7 insertions, 1 deletions
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'.") |