From a0f09378bb2a14477bbeed175f2418eba7784a6c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 23 Jul 1996 16:17:33 +0000 Subject: [PATCH] (etags-goto-tag-location): New local variable LINE; use it. Fix typo in direct-file-tag case: position -> startpos. (tag-word-match-p, tag-exact-file-name-match-p): Fix off-by-one errors. --- lisp/progmodes/etags.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 0afff9a9374..30d9dc84723 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -1075,11 +1075,12 @@ See documentation of variable `tags-file-name'." ;; a search window which expands until it hits the start of file. (defun etags-goto-tag-location (tag-info) (let ((startpos (cdr (cdr tag-info))) + (line (car (cdr tag-info))) offset found pat) (if (eq (car tag-info) t) ;; Direct file tag. (cond (line (goto-line line)) - (position (goto-char position)) + (startpos (goto-char startpos)) (t (error "etags.el BUG: bogus direct file tag"))) ;; This constant is 1/2 the initial search window. ;; There is no sense in making it too small, @@ -1095,8 +1096,8 @@ See documentation of variable `tags-file-name'." (if startpos (setq startpos (1+ startpos))) ;; If no char pos was given, try the given line number. (or startpos - (if (car (cdr tag-info)) - (setq startpos (progn (goto-line (car (cdr tag-info))) + (if line + (setq startpos (progn (goto-line line) (point))))) (or startpos (setq startpos (point-min))) @@ -1234,12 +1235,12 @@ See documentation of variable `tags-file-name'." ;; point should be just after a string that matches TAG. (defun tag-word-match-p (tag) (and (looking-at "\\b.*\177") - (save-excursion (backward-char (1+ (length tag))) + (save-excursion (backward-char (length tag)) (looking-at "\\b")))) (defun tag-exact-file-name-match-p (tag) (and (looking-at ",") - (save-excursion (backward-char (1+ (length tag))) + (save-excursion (backward-char (length tag))) (looking-at "\f\n")))) ;; t if point is in a tag line with a tag containing TAG as a substring. -- 2.39.5