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

[Miles Bader]

Index: emacs/lisp/progmodes/etags.el
diff -c emacs/lisp/progmodes/etags.el:1.176.2.2 
emacs/lisp/progmodes/etags.el:1.176.2.3
*** emacs/lisp/progmodes/etags.el:1.176.2.2     Mon Jun 28 07:29:43 2004
--- emacs/lisp/progmodes/etags.el       Tue Aug  3 00:02:59 2004
***************
*** 1453,1505 ****
      (tags-with-face 'highlight (princ buffer-file-name))
      (princ "':\n\n"))
    (goto-char (point-min))
!   (while (re-search-forward string nil t)
!     (beginning-of-line)
! 
!     (let* (;; Get the local value in the tags table
!          ;; buffer before switching buffers.
!          (goto-func goto-tag-location-function)
!          (tag-info (save-excursion (funcall snarf-tag-function)))
!          (tag (if (eq t (car tag-info)) nil (car tag-info)))
!          (file-path (save-excursion (if tag (file-of-tag)
!                                       (save-excursion (next-line 1)
!                                                       (file-of-tag)))))
!          (file-label (if tag (file-of-tag t)
!                        (save-excursion (next-line 1)
!                                        (file-of-tag t))))
!          (pt (with-current-buffer standard-output (point))))
!       (if tag
!         (progn
!           (princ (format "[%s]: " file-label))
!           (princ tag)
!           (when (= (aref tag 0) ?\() (princ " ...)"))
!           (with-current-buffer standard-output
!             (make-text-button pt (point)
!                               'tag-info tag-info
!                               'file-path file-path
!                               'goto-func goto-func
!                               'action (lambda (button)
!                                         (let ((tag-info (button-get button 
'tag-info))
!                                               (goto-func (button-get button 
'goto-func)))
!                                           (tag-find-file-of-tag (button-get 
button 'file-path))
!                                           (widen)
!                                           (funcall goto-func tag-info)))
!                               'face 'tags-tag-face
!                               'type 'button)))
!       (princ (format "- %s" file-label))
!       (with-current-buffer standard-output
!         (make-text-button pt (point)
!                           'file-path file-path
!                           'action (lambda (button)
!                                     (tag-find-file-of-tag (button-get button 
'file-path))
!                                     ;; Get the local value in the tags table
!                                     ;; buffer before switching buffers.
!                                     (goto-char (point-min)))
!                           'face 'tags-tag-face
!                           'type 'button))
!       ))
!     (terpri)
!     (forward-line 1))
    (when tags-apropos-verbose (princ "\n")))
  
  (defun etags-tags-table-files ()
--- 1453,1510 ----
      (tags-with-face 'highlight (princ buffer-file-name))
      (princ "':\n\n"))
    (goto-char (point-min))
!   (let ((point-max (/ (float (point-max)) 100.0)))
!     (while (re-search-forward string nil t)
!       (message "Making tags apropos buffer for `%s'...%d%%"
!              string
!              (/ (point) point-max))
!       (beginning-of-line)
! 
!       (let* ( ;; Get the local value in the tags table
!            ;; buffer before switching buffers.
!            (goto-func goto-tag-location-function)
!            (tag-info (save-excursion (funcall snarf-tag-function)))
!            (tag (if (eq t (car tag-info)) nil (car tag-info)))
!            (file-path (save-excursion (if tag (file-of-tag)
!                                         (save-excursion (next-line 1)
!                                                         (file-of-tag)))))
!            (file-label (if tag (file-of-tag t)
!                          (save-excursion (next-line 1)
!                                          (file-of-tag t))))
!            (pt (with-current-buffer standard-output (point))))
!       (if tag
!           (progn
!             (princ (format "[%s]: " file-label))
!             (princ tag)
!             (when (= (aref tag 0) ?\() (princ " ...)"))
!             (with-current-buffer standard-output
!               (make-text-button pt (point)
!                                 'tag-info tag-info
!                                 'file-path file-path
!                                 'goto-func goto-func
!                                 'action (lambda (button)
!                                           (let ((tag-info (button-get button 
'tag-info))
!                                                 (goto-func (button-get button 
'goto-func)))
!                                             (tag-find-file-of-tag (button-get 
button 'file-path))
!                                             (widen)
!                                             (funcall goto-func tag-info)))
!                                 'face 'tags-tag-face
!                                 'type 'button)))
!         (princ (format "- %s" file-label))
!         (with-current-buffer standard-output
!           (make-text-button pt (point)
!                             'file-path file-path
!                             'action (lambda (button)
!                                       (tag-find-file-of-tag (button-get 
button 'file-path))
!                                       ;; Get the local value in the tags table
!                                       ;; buffer before switching buffers.
!                                       (goto-char (point-min)))
!                             'face 'tags-tag-face
!                             'type 'button))
!         ))
!       (terpri)
!       (forward-line 1))
!     (message nil))
    (when tags-apropos-verbose (princ "\n")))
  
  (defun etags-tags-table-files ()