Commit 2aa9d1be authored by Francesco Potortì's avatar Francesco Potortì
Browse files

Rearranged the order in which the tag-*-match-p functions are defined,

for clarity purposes.  No code change.
parent b7b893bd
...@@ -1461,7 +1461,7 @@ where they were found." ...@@ -1461,7 +1461,7 @@ where they were found."
(lambda () (zerop (buffer-size)))))) (lambda () (zerop (buffer-size))))))
;; Match qualifier functions for tagnames. ;; Match qualifier functions for tagnames.
;; XXX these functions assume etags file format. ;; 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. ;; This might be a neat idea, but it's too hairy at the moment.
;;(defmacro tags-with-syntax (&rest body) ;;(defmacro tags-with-syntax (&rest body)
...@@ -1479,6 +1479,23 @@ where they were found." ...@@ -1479,6 +1479,23 @@ where they were found."
;; (set-syntax-table otable)))) ;; (set-syntax-table otable))))
;;(put 'tags-with-syntax 'edebug-form-spec '(&rest form)) ;;(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. ;; t if point is at a tag line that matches TAG exactly.
;; point should be just after a string that matches TAG. ;; point should be just after a string that matches TAG.
(defun tag-exact-match-p (tag) (defun tag-exact-match-p (tag)
...@@ -1503,23 +1520,6 @@ where they were found." ...@@ -1503,23 +1520,6 @@ where they were found."
(save-excursion (backward-char (length tag)) (save-excursion (backward-char (length tag))
(looking-at "\\b")))) (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 ;; partial file name match, i.e. searched tag must match a substring
;; of the file name (potentially including a directory separator). ;; of the file name (potentially including a directory separator).
(defun tag-partial-file-name-match-p (tag) (defun tag-partial-file-name-match-p (tag)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment