[Emacs-diffs] /srv/bzr/emacs/trunk r101825: Add a shadow-mode for load-path shadows.

[Glenn Morris]

------------------------------------------------------------
revno: 101825
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-10-06 19:37:39 -0700
message:
  Add a shadow-mode for load-path shadows.
  
  * lisp/emacs-lisp/shadow.el (shadow-font-lock-keywords): New variable.
  (shadow-mode): New mode.
  (shadow-find-file): New button.
  (list-load-path-shadows): Use shadow-mode and buttons.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/shadow.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-07 02:32:52 +0000
+++ b/lisp/ChangeLog    2010-10-07 02:37:39 +0000
@@ -1,5 +1,10 @@
 2010-10-07  Glenn Morris  <address@hidden>
 
+       * emacs-lisp/shadow.el (shadow-font-lock-keywords): New variable.
+       (shadow-mode): New mode.
+       (shadow-find-file): New button.
+       (list-load-path-shadows): Use shadow-mode and buttons.
+
        * iimage.el (iimage-version): Remove.
        (iimage-mode-image-search-path, iimage-mode-image-regex-alist):
        Turn into defcustoms.

=== modified file 'lisp/emacs-lisp/shadow.el'
--- a/lisp/emacs-lisp/shadow.el 2010-01-13 08:35:10 +0000
+++ b/lisp/emacs-lisp/shadow.el 2010-10-07 02:37:39 +0000
@@ -151,6 +151,34 @@
                 (and (= (nth 7 (file-attributes f1))
                         (nth 7 (file-attributes f2)))
                      (eq 0 (call-process "cmp" nil nil nil "-s" f1 f2))))))))
+
+(defvar shadow-font-lock-keywords
+  `((,(format "hides \\(%s.*\\)"
+             (file-name-directory (locate-library "simple.el")))
+     . (1 font-lock-warning-face)))
+  "Keywords to highlight in `shadow-mode'.")
+
+(define-derived-mode shadow-mode fundamental-mode "Shadow"
+  "Major mode for load-path shadows buffer."
+  (set (make-local-variable 'font-lock-defaults)
+       '((shadow-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
+  'follow-link t
+;;  'face 'default
+  'action (lambda (button)
+           (let ((file (concat (button-get button 'shadow-file) ".el")))
+             (or (file-exists-p file)
+                 (setq file (concat file ".gz")))
+             (if (file-readable-p file)
+                 (pop-to-buffer (find-file-noselect file))
+               (error "Cannot read file"))))
+  'help-echo "mouse-2, RET: find this file")
+
 
 ;;;###autoload
 (defun list-load-path-shadows (&optional stringp)
@@ -234,14 +262,20 @@
              ;; Create the *Shadows* buffer and display shadowings there.
              (let ((string (buffer-string)))
                (with-current-buffer (get-buffer-create "*Shadows*")
-                  (fundamental-mode)    ;run after-change-major-mode-hook.
                  (display-buffer (current-buffer))
-                 (setq buffer-undo-list t
-                       buffer-read-only nil)
-                 (erase-buffer)
-                 (insert string)
-                 (insert msg "\n")
-                 (setq buffer-read-only t)))
+                 (shadow-mode)     ; run after-change-major-mode-hook
+                 (let ((inhibit-read-only t))
+                   (erase-buffer)
+                   (insert string)
+                   (insert msg "\n")
+                   (while (re-search-backward "\\(^.*\\) hides \\(.*$\\)"
+                                              nil t)
+                     (dotimes (i 2)
+                       (make-button (match-beginning (1+ i))
+                                    (match-end (1+ i))
+                                    'type 'shadow-find-file 'shadow-file
+                                    (match-string (1+ i)))))
+                   (goto-char (point-max)))))
            ;; We are non-interactive, print shadows via message.
            (unless (zerop n)
              (message "This site has duplicate Lisp libraries with the same 
name.
@@ -259,5 +293,4 @@
 
 (provide 'shadow)
 
-;; arch-tag: 0480e8a7-62ed-4a12-a9f6-f44ded9b0830
 ;;; shadow.el ends here