diff options
| author | Francesco Potortì | 2002-06-20 10:12:43 +0000 |
|---|---|---|
| committer | Francesco Potortì | 2002-06-20 10:12:43 +0000 |
| commit | 2aa9d1be86933bfd18462c513f7bd6ad90e0513e (patch) | |
| tree | 9feb53b908c24f444f15bd5069de43d502919149 | |
| parent | b7b893bd8847d6d33f4ffcba52764850173d54b3 (diff) | |
| download | emacs-2aa9d1be86933bfd18462c513f7bd6ad90e0513e.tar.gz emacs-2aa9d1be86933bfd18462c513f7bd6ad90e0513e.zip | |
Rearranged the order in which the tag-*-match-p functions are defined,
for clarity purposes. No code change.
| -rw-r--r-- | lisp/progmodes/etags.el | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 7956444f761..a4aeaa2e3fe 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el | |||
| @@ -1461,7 +1461,7 @@ where they were found." | |||
| 1461 | (lambda () (zerop (buffer-size)))))) | 1461 | (lambda () (zerop (buffer-size)))))) |
| 1462 | 1462 | ||
| 1463 | ;; Match qualifier functions for tagnames. | 1463 | ;; Match qualifier functions for tagnames. |
| 1464 | ;; XXX these functions assume etags file format. | 1464 | ;; These functions assume the etags file format defined in etc/ETAGS.EBNF. |
| 1465 | 1465 | ||
| 1466 | ;; This might be a neat idea, but it's too hairy at the moment. | 1466 | ;; This might be a neat idea, but it's too hairy at the moment. |
| 1467 | ;;(defmacro tags-with-syntax (&rest body) | 1467 | ;;(defmacro tags-with-syntax (&rest body) |
| @@ -1479,6 +1479,23 @@ where they were found." | |||
| 1479 | ;; (set-syntax-table otable)))) | 1479 | ;; (set-syntax-table otable)))) |
| 1480 | ;;(put 'tags-with-syntax 'edebug-form-spec '(&rest form)) | 1480 | ;;(put 'tags-with-syntax 'edebug-form-spec '(&rest form)) |
| 1481 | 1481 | ||
| 1482 | ;; exact file name match, i.e. searched tag must match complete file | ||
| 1483 | ;; name including directories parts if there are some. | ||
| 1484 | (defun tag-exact-file-name-match-p (tag) | ||
| 1485 | (and (looking-at ",[0-9\n]") | ||
| 1486 | (save-excursion (backward-char (+ 2 (length tag))) | ||
| 1487 | (looking-at "\f\n")))) | ||
| 1488 | ;; file name match as above, but searched tag must match the file | ||
| 1489 | ;; name not including the directories if there are some. | ||
| 1490 | (defun tag-file-name-match-p (tag) | ||
| 1491 | (and (looking-at ",[0-9\n]") | ||
| 1492 | (save-excursion (backward-char (1+ (length tag))) | ||
| 1493 | (looking-at "/")))) | ||
| 1494 | ;; this / to detect we are after a directory separator is ok for unix, | ||
| 1495 | ;; is there a variable that contains the regexp for directory separator | ||
| 1496 | ;; on whatever operating system ? | ||
| 1497 | ;; Looks like ms-win will lose here :). | ||
| 1498 | |||
| 1482 | ;; t if point is at a tag line that matches TAG exactly. | 1499 | ;; t if point is at a tag line that matches TAG exactly. |
| 1483 | ;; point should be just after a string that matches TAG. | 1500 | ;; point should be just after a string that matches TAG. |
| 1484 | (defun tag-exact-match-p (tag) | 1501 | (defun tag-exact-match-p (tag) |
| @@ -1503,23 +1520,6 @@ where they were found." | |||
| 1503 | (save-excursion (backward-char (length tag)) | 1520 | (save-excursion (backward-char (length tag)) |
| 1504 | (looking-at "\\b")))) | 1521 | (looking-at "\\b")))) |
| 1505 | 1522 | ||
| 1506 | ;; exact file name match, i.e. searched tag must match complete file | ||
| 1507 | ;; name including directories parts if there are some. | ||
| 1508 | (defun tag-exact-file-name-match-p (tag) | ||
| 1509 | (and (looking-at ",[0-9\n]") | ||
| 1510 | (save-excursion (backward-char (+ 2 (length tag))) | ||
| 1511 | (looking-at "\f\n")))) | ||
| 1512 | ;; file name match as above, but searched tag must match the file | ||
| 1513 | ;; name not including the directories if there are some. | ||
| 1514 | (defun tag-file-name-match-p (tag) | ||
| 1515 | (and (looking-at ",[0-9\n]") | ||
| 1516 | (save-excursion (backward-char (1+ (length tag))) | ||
| 1517 | (looking-at "/")))) | ||
| 1518 | ;; this / to detect we are after a directory separator is ok for unix, | ||
| 1519 | ;; is there a variable that contains the regexp for directory separator | ||
| 1520 | ;; on whatever operating system ? | ||
| 1521 | ;; Looks like ms-win will lose here :). | ||
| 1522 | |||
| 1523 | ;; partial file name match, i.e. searched tag must match a substring | 1523 | ;; partial file name match, i.e. searched tag must match a substring |
| 1524 | ;; of the file name (potentially including a directory separator). | 1524 | ;; of the file name (potentially including a directory separator). |
| 1525 | (defun tag-partial-file-name-match-p (tag) | 1525 | (defun tag-partial-file-name-match-p (tag) |