martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

load-path-shadows-font-lock-keywords tweak

Browse Source 
* lisp/emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords):
Be more robust about locating simple.el.
This commit is contained in:
Glenn Morris
2012-09-11 00:13:21 -07:00
parent fa05bfe052
commit 511fd0b2f4
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@@ -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.

8
lisp/emacs-lisp/shadow.el
View File

@@ -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'.")