aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2006-02-17 21:55:44 +0000
committerJuri Linkov2006-02-17 21:55:44 +0000
commitd73c9bcb7913270fe7c8c3eb6f0904889c8cbbb7 (patch)
treebd1bb379f41e85a1d9c8b4d9c7eeb946c5e71cf4
parent78421c58856357021d07e8f3693a9f46ed3f6470 (diff)
downloademacs-d73c9bcb7913270fe7c8c3eb6f0904889c8cbbb7.tar.gz
emacs-d73c9bcb7913270fe7c8c3eb6f0904889c8cbbb7.zip
(Info-search): Skip `Local Variables' node.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/info.el6
2 files changed, 15 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3aa80e6446b..6efd2366320 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
12006-02-17 Juri Linkov <juri@jurta.org> 12006-02-17 Juri Linkov <juri@jurta.org>
2 2
3 * ffap.el (ffap) <defface>: Add explicit face declaration.
4 (ffap-highlight): Use face `ffap' directly instead of checking
5 for its existence.
6
7 * icomplete.el (icomplete-get-keys): Use `t' for the second arg
8 `visible-ok' of `other-buffer' to find the right original buffer.
9
10 * info.el (Info-search): Skip `Local Variables' node.
11
122006-02-17 Juri Linkov <juri@jurta.org>
13
3 * info.el (Info-find-file): Check for symbols `apropos', `history', 14 * info.el (Info-find-file): Check for symbols `apropos', `history',
4 `toc' in the input filename, and return these symbols as is. 15 `toc' in the input filename, and return these symbols as is.
5 (Info-find-node-2): Set Info-current-file to symbols `apropos', 16 (Info-find-node-2): Set Info-current-file to symbols `apropos',
diff --git a/lisp/info.el b/lisp/info.el
index e2baa3aa583..e9d7f5ca2de 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1640,7 +1640,8 @@ If DIRECTION is `backward', search in the reverse direction."
1640 ;; Skip Tag Table node 1640 ;; Skip Tag Table node
1641 (save-excursion 1641 (save-excursion
1642 (and (search-backward "\^_" nil t) 1642 (and (search-backward "\^_" nil t)
1643 (looking-at "\^_\nTag Table")))))) 1643 (looking-at
1644 "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
1644 (let ((search-spaces-regexp Info-search-whitespace-regexp)) 1645 (let ((search-spaces-regexp Info-search-whitespace-regexp))
1645 (if (if backward 1646 (if (if backward
1646 (re-search-backward regexp bound t) 1647 (re-search-backward regexp bound t)
@@ -1728,7 +1729,8 @@ If DIRECTION is `backward', search in the reverse direction."
1728 ;; Skip Tag Table node 1729 ;; Skip Tag Table node
1729 (save-excursion 1730 (save-excursion
1730 (and (search-backward "\^_" nil t) 1731 (and (search-backward "\^_" nil t)
1731 (looking-at "\^_\nTag Table")))))) 1732 (looking-at
1733 "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
1732 (let ((search-spaces-regexp Info-search-whitespace-regexp)) 1734 (let ((search-spaces-regexp Info-search-whitespace-regexp))
1733 (if (if backward 1735 (if (if backward
1734 (re-search-backward regexp nil t) 1736 (re-search-backward regexp nil t)