[Emacs-diffs] Changes to emacs/lisp/progmodes/etags.el

[Miles Bader]

Index: emacs/lisp/progmodes/etags.el
diff -c emacs/lisp/progmodes/etags.el:1.171 emacs/lisp/progmodes/etags.el:1.172
*** emacs/lisp/progmodes/etags.el:1.171 Tue Feb 11 16:40:17 2003
--- emacs/lisp/progmodes/etags.el       Thu Apr  3 10:55:37 2003
***************
*** 29,34 ****
--- 29,35 ----
  ;;; Code:
  
  (require 'ring)
+ (require 'button)
  
  ;;;###autoload
  (defvar tags-file-name nil
***************
*** 1413,1428 ****
    (goto-char (point-min))
    (while (re-search-forward string nil t)
      (beginning-of-line)
!     (let ((tag (buffer-substring (point)
!                                (progn (skip-chars-forward "^\177")
!                                       (point))))
!           (props `(action find-tag-other-window mouse-face highlight
!                         face ,tags-tag-face))
!           (pt (with-current-buffer standard-output (point))))
!       (princ tag)
!       (when (= (aref tag 0) ?\() (princ " ...)"))
!       (add-text-properties pt (with-current-buffer standard-output (point))
!                            `(item ,tag ,@props) standard-output))
      (terpri)
      (forward-line 1))
    (when tags-apropos-verbose (princ "\n")))
--- 1414,1454 ----
    (goto-char (point-min))
    (while (re-search-forward string nil t)
      (beginning-of-line)
!     (let* ((tag-info (save-excursion (funcall snarf-tag-function)))
!          (tag (if (eq t (car tag-info)) nil (car tag-info)))
!          (file (if tag (file-of-tag)
!                  (save-excursion (next-line 1)
!                                  (file-of-tag))))
!          (pt (with-current-buffer standard-output (point))))
!       (if tag
!         (progn
!           (princ (format "[%s]: " file))
!           (princ tag)
!           (when (= (aref tag 0) ?\() (princ " ...)"))
!           (with-current-buffer standard-output
!           (make-text-button pt (point)
!                             'tag-info tag-info
!                             'file file
!                             'action (lambda (button)
!                                       ;; TODO: just `find-file is too simple.
!                                       ;; Use code `find-tag-in-order'.
!                                       (let ((tag-info (button-get button 
'tag-info)))
!                                         (find-file (button-get button 'file))
!                                         (etags-goto-tag-location tag-info)))
!                             'face 'tags-tag-face
!                             'type 'button)))
!       (princ (format "- %s" file))
!       (with-current-buffer standard-output
!         (make-text-button pt (point)
!         'file file
!         'action (lambda (button)
!                   ;; TODO: just `find-file is too simple.
!                   ;; Use code `find-tag-in-order'.
!                   (find-file (button-get button 'file))
!                   (goto-char (point-min)))
!         'face 'tags-tag-face
!         'type 'button))
!       ))
      (terpri)
      (forward-line 1))
    (when tags-apropos-verbose (princ "\n")))
***************
*** 1814,1821 ****
          (funcall tags-apropos-function regexp))))
      (etags-tags-apropos-additional regexp))
    (with-current-buffer "*Tags List*"
!     (setq buffer-read-only t)
!     (apropos-mode)))
  
  ;; XXX Kludge interface.
  
--- 1840,1849 ----
          (funcall tags-apropos-function regexp))))
      (etags-tags-apropos-additional regexp))
    (with-current-buffer "*Tags List*"
!     (apropos-mode)
!     ;; apropos-mode is derived from fundamental-mode and it kills
!     ;; all local variables.
!     (setq buffer-read-only t)))
  
  ;; XXX Kludge interface.