X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Finfo.el;h=41cfc46f749ed9b8bf97066767650a67dac8e2d0;hp=be66af10d87c0462fc2584596c7569466ebd4160;hb=79d2db7d65205bc85d471590726d0cf3af5598e0;hpb=3198ed8319f99e19a14447745f4f93e4b4522961

diff --git a/lisp/info.el b/lisp/info.el
index be66af1..41cfc46 100644
--- 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)
@@ -1510,7 +1510,7 @@ versions of NAME. Only the suffixes are tried."
 			   (format (cdr (car suff)) file)
 			 (concat (cdr (car suff)) " < " file))))
 	  (message "%s..." command)
-	  (call-process shell-file-name nil t nil "-c" command)
+	  (call-process shell-file-name nil t nil shell-command-switch command)
 	  (message "")
 	  (when visit
 	    (setq buffer-file-name file)
@@ -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")