Changeset 4091 for trunk/lisp/info.el

Timestamp:

05/27/06 10:35:24 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/info.el (modified) (2 diffs)

trunk/lisp/info.el

@@ -2867 +2867 @@
-           (nth 2 (car Info-index-alternatives))
-           (if (cdr Info-index-alternatives)
-
-
+
+
+
+
+
-             "(Only match)")))
-
@@ -2908 +2911 @@
-      (let ((Info-fontify-maximum-menu-size nil))
-        (Info-directory)
+        ;; current-node and current-file are nil when they invoke info-apropos
+        ;; as the first Info command, i.e. info-apropos loads info.el.  In that
+        ;; case, we use (DIR)Top instead, to avoid signalling an error after
+        ;; the search is complete.
+        (when (null current-node)
+          (setq current-file Info-current-file)
+          (setq current-node Info-current-node))
-        (message "Searching indices...")
-        (goto-char (point-min))
-        (re-search-forward "\\* Menu: *\n" nil t)
-        (while (re-search-forward "\\*.*: *(\\([^)]+\\))" nil t)
-
+
+
+
-        (dolist (manual (nreverse manuals))
-          (message "Searching %s" manual)