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

[Francesco Potortì]

Index: emacs/lisp/progmodes/etags.el
diff -c emacs/lisp/progmodes/etags.el:1.166 emacs/lisp/progmodes/etags.el:1.167
*** emacs/lisp/progmodes/etags.el:1.166 Thu Jun 20 06:05:11 2002
--- emacs/lisp/progmodes/etags.el       Thu Jun 20 06:12:43 2002
***************
*** 1461,1467 ****
              (lambda () (zerop (buffer-size))))))
  
  ;; Match qualifier functions for tagnames.
! ;; XXX these functions assume etags file format.
  
  ;; This might be a neat idea, but it's too hairy at the moment.
  ;;(defmacro tags-with-syntax (&rest body)
--- 1461,1467 ----
              (lambda () (zerop (buffer-size))))))
  
  ;; Match qualifier functions for tagnames.
! ;; These functions assume the etags file format defined in etc/ETAGS.EBNF.
  
  ;; This might be a neat idea, but it's too hairy at the moment.
  ;;(defmacro tags-with-syntax (&rest body)
***************
*** 1479,1484 ****
--- 1479,1501 ----
  ;;       (set-syntax-table otable))))
  ;;(put 'tags-with-syntax 'edebug-form-spec '(&rest form))
  
+ ;; exact file name match, i.e. searched tag must match complete file
+ ;; name including directories parts if there are some.
+ (defun tag-exact-file-name-match-p (tag)
+   (and (looking-at ",[0-9\n]")
+        (save-excursion (backward-char (+ 2 (length tag)))
+                      (looking-at "\f\n"))))
+ ;; file name match as above, but searched tag must match the file
+ ;; name not including the directories if there are some.
+ (defun tag-file-name-match-p (tag)
+   (and (looking-at ",[0-9\n]")
+        (save-excursion (backward-char (1+ (length tag)))
+                      (looking-at "/"))))
+ ;; this / to detect we are after a directory separator is ok for unix,
+ ;; is there a variable that contains the regexp for directory separator
+ ;; on whatever operating system ?
+ ;; Looks like ms-win will lose here :).
+ 
  ;; t if point is at a tag line that matches TAG exactly.
  ;; point should be just after a string that matches TAG.
  (defun tag-exact-match-p (tag)
***************
*** 1502,1524 ****
    (and (looking-at "\\b.*\177")
         (save-excursion (backward-char (length tag))
                       (looking-at "\\b"))))
- 
- ;; exact file name match, i.e. searched tag must match complete file
- ;; name including directories parts if there are some.
- (defun tag-exact-file-name-match-p (tag)
-   (and (looking-at ",[0-9\n]")
-        (save-excursion (backward-char (+ 2 (length tag)))
-                      (looking-at "\f\n"))))
- ;; file name match as above, but searched tag must match the file
- ;; name not including the directories if there are some.
- (defun tag-file-name-match-p (tag)
-   (and (looking-at ",[0-9\n]")
-        (save-excursion (backward-char (1+ (length tag)))
-                      (looking-at "/"))))
- ;; this / to detect we are after a directory separator is ok for unix,
- ;; is there a variable that contains the regexp for directory separator
- ;; on whatever operating system ?
- ;; Looks like ms-win will lose here :).
  
  ;; partial file name match, i.e. searched tag must match a substring
  ;; of the file name (potentially including a directory separator).
--- 1519,1524 ----