(Info-last-search): Variable removed.

(Info-search-history): New variable.
(Info-search): New Info-search-history.

diff --git a/lisp/info.el b/lisp/info.el
index 2f5d67444961769702f6eb48905f3fa61557e5c2..4ba595ed0da01ec8bd205482c8ee4db66150bf3f 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1009,16 +1009,17 @@ If FORK is a string, it is the name to use for the new buffer."
          (setq hl nil))                ;terminate the while at next iter
       (setq hl (cdr hl)))))
 \f
-(defvar Info-last-search nil
-  "Default regexp for \\<Info-mode-map>\\[Info-search] command to search for.")
+(defvar Info-search-history nil
+  "The history list for `Info-search'.")
 
 (defun Info-search (regexp)
   "Search for REGEXP, starting from point, and select node it's found in."
-  (interactive "sSearch (regexp): ")
-  (if transient-mark-mode (deactivate-mark))
-  (if (equal regexp "")
-      (setq regexp Info-last-search)
-    (setq Info-last-search regexp))
+  (interactive (list (read-string "Regexp search: "
+                                 nil 'Info-search-history)))
+  (when transient-mark-mode
+    (deactivate-mark))
+  (when (equal regexp "")
+    (setq regexp (car Info-search-history)))
   (when regexp
     (let ((found ()) current
          (onode Info-current-node)