(C6-215D): Use `<-denotational' for U-00020AD7; use `->subsumptive'.

[chise/xemacs-chise.git.1] / lisp / info.el

diff --git a/lisp/info.el b/lisp/info.el
index 3186cdb..8296b9c 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -393,7 +393,7 @@ file. An example might be something like:
   :type '(repeat directory)
   :group 'info)
 
-(defcustom Info-auto-generate-directory 'if-missing
+(defcustom Info-auto-generate-directory 'if-outdated
   "*When to auto generate an info directory listing.
 Possible values are:
 nil or `never' never auto-generate a directory listing,
@@ -1033,7 +1033,7 @@ actually get any text from."
        (setq lbuffers (cdr lbuffers)))
       (message "Composing main Info directory...done"))
     (setq Info-dir-contents (buffer-string)))
-  (setq default-directory Info-dir-contents-directory)
+  (setq default-directory (file-name-as-directory Info-dir-contents-directory))
   (setq buffer-file-name (caar Info-dir-file-attributes)))
 
 (defmacro Info-directory-files (dir-file &optional all full nosort files-only)
@@ -1087,8 +1087,8 @@ optional arguments."
              (null (Info-directory-files file 'all)))
     (if (not (find-buffer-visiting file))
        (if (not (file-exists-p file))
-           (if (or (eq Info-auto-generate-directory 'always)
-                   (eq Info-auto-generate-directory 'if-missing))
+           (if (or (memq Info-auto-generate-directory
+                         '(always if-missing if-outdated)))
                (Info-build-dir-anew (file-name-directory file)))
          (if (or (eq Info-auto-generate-directory 'always)
                  (and (eq Info-auto-generate-directory 'if-outdated)
@@ -2268,7 +2268,7 @@ Give a blank topic name to go to the Index node itself."
   (interactive "sIndex topic: ")
   (let ((pattern (format "\n\\* \\([^\n:]*%s[^\n:]*\\):[ \t]*%s"
                         (regexp-quote topic)
-                        "\\(.*\\)\\.[ t]*\\([0-9]*\\)$"))
+                        "\\(.*\\)\\.[ \t]*\\([0-9]*\\)$"))
        node)
     (message "Searching index for `%s'..." topic)
     (Info-goto-node "Top")
@@ -2430,7 +2430,8 @@ This command is designed to be used whether you are already in Info or not."
                                    (if fn
                                        (format " (default %s)" fn)
                                      ""))
-                           obarray 'fboundp t))
+                           obarray 'fboundp t
+                            nil nil (and fn (symbol-name fn))))
                 (list (if (equal val "")
                           fn (intern val)))))
   (save-window-excursion