Mercurial > emacs
changeset 4407:5568d8e60c21
(etags-tags-completion-table): Fixed regexp for today's format.
(etags-snarf-tag): Skip explicit tag name if present.
| author | Roland McGrath <roland@gnu.org> |
|---|---|
| date | Sun, 01 Aug 1993 22:22:48 +0000 |
| parents | ad13aac8bb60 |
| children | 77f1058e7499 |
| files | lisp/progmodes/etags.el |
| diffstat | 1 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/etags.el Sun Aug 01 22:13:54 1993 +0000 +++ b/lisp/progmodes/etags.el Sun Aug 01 22:22:48 1993 +0000 @@ -918,18 +918,17 @@ ;; \1 is the string to match; ;; \2 is not interesting; ;; \3 is the guessed tag name; XXX guess should be better eg DEFUN - ;; \4 is the char to start searching at; - ;; \5 is the line to start searching at; - ;; \6 is not interesting; - ;; \7 is the explicitly-specified tag name. + ;; \4 is not interesting; + ;; \5 is the explicitly-specified tag name. + ;; \6 is the line to start searching at; + ;; \7 is the char to start searching at. (while (re-search-forward "^\\(\\(.+[^-a-zA-Z0-9_$]+\\)?\\([-a-zA-Z0-9_$]+\\)\ -\[^-a-zA-Z0-9_$]*\\)\177\ -\\([0-9]+\\),\\([0-9]+\\)\\(,\001\\([^\n]+\\)\\)?\n" +\[^-a-zA-Z0-9_$]*\\)\177\\(\\([^\n\001]+\\)\001\\)?\\([0-9]+\\),\\([0-9]+\\)\n" nil t) - (intern (if (match-beginning 6) + (intern (if (match-beginning 5) ;; There is an explicit tag name. - (buffer-substring (match-beginning 6) (match-end 6)) + (buffer-substring (match-beginning 5) (match-end 5)) ;; No explicit tag name. Best guess. (buffer-substring (match-beginning 3) (match-end 3))) table))) @@ -941,6 +940,8 @@ (setq tag-text (buffer-substring (1- (point)) (save-excursion (beginning-of-line) (point)))) + ;; Skip explicit tag name if present. + (search-forward "\001" (save-excursion (forward-line 1) (point)) t) (search-forward ",") (setq startpos (string-to-int (buffer-substring (point)