From cb7de2e75971f44c270ed8c0bc92fccf34fdce2d Mon Sep 17 00:00:00 2001 From: Richard M. Stallman Date: Mon, 8 Nov 2004 16:43:00 +0000 Subject: (Info-revert-find-node): Don't use beginning-of-buffer. --- lisp/info.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/info.el') diff --git a/lisp/info.el b/lisp/info.el index 8aaf7755df2..baeec935ee7 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -657,10 +657,10 @@ is preserved, if possible." (equal old-nodename Info-current-node)) (progn ;; note goto-line is no good, we want to measure from point-min - (beginning-of-buffer) + (goto-char (point-min)) (forward-line wline) (set-window-start (selected-window) (point)) - (beginning-of-buffer) + (goto-char (point-min)) (forward-line pline) (move-to-column pcolumn)) ;; only add to the history when coming from a different file+node -- cgit v1.2.1 From be4b3ae8beb76dac0ed37fcfde2b84fc872602a1 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 11 Nov 2004 21:45:57 +0000 Subject: (Info-search): Save match data for isearch. Skip Tag Table node. --- lisp/info.el | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'lisp/info.el') diff --git a/lisp/info.el b/lisp/info.el index baeec935ee7..cc7ed2ae59b 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1484,13 +1484,18 @@ If DIRECTION is `backward', search in the reverse direction." (1- (point))) (point-max))) (while (and (not give-up) - (or (null found) - (if backward - (isearch-range-invisible found beg-found) - (isearch-range-invisible beg-found found)) - ;; Skip node header line - (save-excursion (forward-line -1) - (looking-at "\^_")))) + (save-match-data + (or (null found) + (if backward + (isearch-range-invisible found beg-found) + (isearch-range-invisible beg-found found)) + ;; Skip node header line + (save-excursion (forward-line -1) + (looking-at "\^_")) + ;; Skip Tag Table node + (save-excursion + (and (search-backward "\^_" nil t) + (looking-at "\^_\nTag Table")))))) (if (if backward (re-search-backward regexp bound t) (re-search-forward regexp bound t)) @@ -1552,13 +1557,18 @@ If DIRECTION is `backward', search in the reverse direction." (setq list (cdr list)) (setq give-up nil found nil) (while (and (not give-up) - (or (null found) - (if backward - (isearch-range-invisible found beg-found) - (isearch-range-invisible beg-found found)) - ;; Skip node header line - (save-excursion (forward-line -1) - (looking-at "\^_")))) + (save-match-data + (or (null found) + (if backward + (isearch-range-invisible found beg-found) + (isearch-range-invisible beg-found found)) + ;; Skip node header line + (save-excursion (forward-line -1) + (looking-at "\^_")) + ;; Skip Tag Table node + (save-excursion + (and (search-backward "\^_" nil t) + (looking-at "\^_\nTag Table")))))) (if (if backward (re-search-backward regexp nil t) (re-search-forward regexp nil t)) -- cgit v1.2.1