diff options
author | Kenichi Handa <handa@gnu.org> | 2012-09-22 11:26:05 +0900 |
---|---|---|
committer | Kenichi Handa <handa@gnu.org> | 2012-09-22 11:26:05 +0900 |
commit | fa42927fd0ed023ec95a5475ce342429fd8a348d (patch) | |
tree | 5f37f88faa47b36dc85d19aedf89f483dc458358 /lisp/emacs-lisp/shadow.el | |
parent | 3cccbd87267735609a21df50b80b3aad07004555 (diff) | |
parent | 58f3a196fcd6c2f8b65e6b6cf1bc377d1a6287aa (diff) | |
download | emacs-fa42927fd0ed023ec95a5475ce342429fd8a348d.tar.gz emacs-fa42927fd0ed023ec95a5475ce342429fd8a348d.tar.bz2 emacs-fa42927fd0ed023ec95a5475ce342429fd8a348d.zip |
merge trunk
Diffstat (limited to 'lisp/emacs-lisp/shadow.el')
-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'.") |