[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.1 
emacs/lisp/progmodes/etags.el:1.176.2.2
*** emacs/lisp/progmodes/etags.el:1.176.2.1     Fri Apr 16 12:50:34 2004
--- emacs/lisp/progmodes/etags.el       Mon Jun 28 07:29:43 2004
***************
*** 1248,1254 ****
  
  
  (defun etags-tags-completion-table ()
!   (let ((table (make-vector 511 0)))
      (save-excursion
        (goto-char (point-min))
        ;; This monster regexp matches an etags tag line.
--- 1248,1258 ----
  
  
  (defun etags-tags-completion-table ()
!   (let ((table (make-vector 511 0))
!       (point-max (/ (float (point-max)) 100.0))
!       (msg-fmt (format 
!                 "Making tags completion table for %s...%%d%%%%"
!                 buffer-file-name)))
      (save-excursion
        (goto-char (point-min))
        ;; This monster regexp matches an etags tag line.
***************
*** 1264,1274 ****
  \\([-a-zA-Z0-9_+*$?:]+\\)[^-a-zA-Z0-9_+*$?:\177]*\\)\177\
  \\(\\([^\n\001]+\\)\001\\)?\\([0-9]+\\)?,\\([0-9]+\\)?\n"
              nil t)
!       (intern (if (match-beginning 5)
!                   ;; There is an explicit tag name.
!                   (buffer-substring (match-beginning 5) (match-end 5))
!                 ;; No explicit tag name.  Best guess.
!                 (buffer-substring (match-beginning 3) (match-end 3)))
                table)))
      table))
  
--- 1268,1279 ----
  \\([-a-zA-Z0-9_+*$?:]+\\)[^-a-zA-Z0-9_+*$?:\177]*\\)\177\
  \\(\\([^\n\001]+\\)\001\\)?\\([0-9]+\\)?,\\([0-9]+\\)?\n"
              nil t)
!       (intern (prog1 (if (match-beginning 5)
!                          ;; There is an explicit tag name.
!                          (buffer-substring (match-beginning 5) (match-end 5))
!                        ;; No explicit tag name.  Best guess.
!                        (buffer-substring (match-beginning 3) (match-end 3)))
!                 (message msg-fmt (/ (point) point-max)))
                table)))
      table))
  
***************
*** 1866,1871 ****
--- 1871,1877 ----
        (or gotany
            (error "File %s not in current tags tables" file)))))
    (with-current-buffer "*Tags List*"
+     (require 'apropos)
      (apropos-mode)
      (setq buffer-read-only t)))
  
***************
*** 1884,1889 ****
--- 1890,1896 ----
          (funcall tags-apropos-function regexp))))
      (etags-tags-apropos-additional regexp))
    (with-current-buffer "*Tags List*"
+     (require 'apropos)
      (apropos-mode)
      ;; apropos-mode is derived from fundamental-mode and it kills
      ;; all local variables.