Rename some more shadow.el stuff.

* lisp/emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords)
(load-path-shadows-find-file): Rename variable and button.
(list-load-path-shadows): Update button caller.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ae59478249c483891622ac542e70d5ff325fcf8..d6458c792e1cf6abf811515476ce5a70fab5a6d2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,9 @@
        * emacs-lisp/shadow.el (shadow-font-lock-keywords)
        (load-path-shadows-mode, list-load-path-shadows): Rename shadow-mode to
        load-path-shadows-mode, update references.
+       (load-path-shadows-font-lock-keywords, load-path-shadows-find-file):
+       Rename variable and button.
+       (list-load-path-shadows): Update button caller.
 
 2010-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index 9297ee8b068720536116bcaa6b9f8b49de1089ef..ee59cca2d6fe7b965f04fc9e12d55e1ff06ff9c6 100644 (file)
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -152,7 +152,7 @@ See the documentation for `list-load-path-shadows' for further information."
                         (nth 7 (file-attributes f2)))
                      (eq 0 (call-process "cmp" nil nil nil "-s" f1 f2))))))))
 
-(defvar shadow-font-lock-keywords
+(defvar load-path-shadows-font-lock-keywords
   `((,(format "hides \\(%s.*\\)"
              (file-name-directory (locate-library "simple.el")))
      . (1 font-lock-warning-face)))
@@ -161,13 +161,13 @@ See the documentation for `list-load-path-shadows' for further information."
 (define-derived-mode load-path-shadows-mode fundamental-mode "LP-Shadows"
   "Major mode for load-path shadows buffer."
   (set (make-local-variable 'font-lock-defaults)
-       '((shadow-font-lock-keywords)))
+       '((load-path-shadows-font-lock-keywords)))
   (setq buffer-undo-list t
        buffer-read-only t))
 
 ;; TODO use text-properties instead, a la dired.
 (require 'button)
-(define-button-type 'shadow-find-file
+(define-button-type 'load-path-shadows-find-file
   'follow-link t
 ;;  'face 'default
   'action (lambda (button)
@@ -273,7 +273,8 @@ function, `find-emacs-lisp-shadows'."
                      (dotimes (i 2)
                        (make-button (match-beginning (1+ i))
                                     (match-end (1+ i))
-                                    'type 'shadow-find-file 'shadow-file
+                                    'type 'load-path-shadows-find-file
+                                    'shadow-file
                                     (match-string (1+ i)))))
                    (goto-char (point-max)))))
            ;; We are non-interactive, print shadows via message.