aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Harder2004-04-14 15:58:30 +0000
committerJesper Harder2004-04-14 15:58:30 +0000
commit37600b6d00192db5ebf04a0299e3fcac03b35752 (patch)
tree30004b2996bb4722f38c355bd06e11442b51484a
parentf3544d1135113921b67604dc5ae8fb5ab26b3771 (diff)
downloademacs-37600b6d00192db5ebf04a0299e3fcac03b35752.tar.gz
emacs-37600b6d00192db5ebf04a0299e3fcac03b35752.zip
(info-apropos): Don't clobber Info-history-list.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/info.el4
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ddd1eb78fb..b3cada9ab06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12004-04-14 Jesper Harder <harder@ifa.au.dk>
2
3 * info.el (info-apropos): Don't clobber Info-history-list.
4
12004-04-14 Daniel Pfeiffer <occitan@esperanto.org> 52004-04-14 Daniel Pfeiffer <occitan@esperanto.org>
2 6
3 * progmodes/compile.el (compilation-setup): Localize 7 * progmodes/compile.el (compilation-setup): Localize
diff --git a/lisp/info.el b/lisp/info.el
index 34ec499d542..96445a18e28 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2432,6 +2432,7 @@ Build a menu of the possible matches."
2432 (let ((pattern (format "\n\\* +\\([^\n]*%s[^\n]*\\):[ \t]+\\([^.]+\\)." 2432 (let ((pattern (format "\n\\* +\\([^\n]*%s[^\n]*\\):[ \t]+\\([^.]+\\)."
2433 (regexp-quote string))) 2433 (regexp-quote string)))
2434 (ohist Info-history) 2434 (ohist Info-history)
2435 (ohist-list Info-history-list)
2435 (current-node Info-current-node) 2436 (current-node Info-current-node)
2436 (current-file Info-current-file) 2437 (current-file Info-current-file)
2437 manuals matches temp-file node) 2438 manuals matches temp-file node)
@@ -2465,7 +2466,8 @@ Build a menu of the possible matches."
2465 (Info-goto-node node)))) 2466 (Info-goto-node node))))
2466 (error nil)))) 2467 (error nil))))
2467 (Info-goto-node (concat "(" current-file ")" current-node)) 2468 (Info-goto-node (concat "(" current-file ")" current-node))
2468 (setq Info-history ohist) 2469 (setq Info-history ohist
2470 Info-history-list ohist-list)
2469 (message "Searching indices...done") 2471 (message "Searching indices...done")
2470 (if (null matches) 2472 (if (null matches)
2471 (message "No matches found") 2473 (message "No matches found")