Mercurial > emacs
changeset 30686:23c301a64c8f
(Info-insert-dir): Use Info-additional-directory-list if
non-nil.
(Info-file-list-for-emacs): Remove "info" from the list because
that leads to trying to use the documentation from file `info'
in various situations where it isn't appropriate, for instance
C-h C-k C-h i.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Tue, 08 Aug 2000 18:29:49 +0000 |
| parents | 8d91aa85240f |
| children | 34027013888a |
| files | lisp/info.el |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/info.el Tue Aug 08 16:30:54 2000 +0000 +++ b/lisp/info.el Tue Aug 08 18:29:49 2000 +0000 @@ -576,7 +576,9 @@ ;; Search file for a suitable node. (let ((guesspos (point-min)) (regexp (concat "\\(Node:\\|Ref:\\) *\\(" - (regexp-quote nodename) + (if (stringp nodename) + (regexp-quote nodename) + "") "\\) *[,\t\n\177]")) (nodepos nil)) @@ -665,7 +667,10 @@ (progn (insert Info-dir-contents) (goto-char (point-min))) - (let ((dirs Info-directory-list) + (let ((dirs (if Info-additional-directory-list + (append Info-directory-list + Info-additional-directory-list) + Info-directory-list)) ;; Bind this in case the user sets it to nil. (case-fold-search t) ;; This is set non-nil if we find a problem in some input files. @@ -2167,7 +2172,7 @@ (message "Tags may have changed. Use Info-tagify if necessary"))) (defvar Info-file-list-for-emacs - '("ediff" "forms" "gnus" "info" ("mh" . "mh-e") "sc" "message" + '("ediff" "forms" "gnus" ("mh" . "mh-e") "sc" "message" ("dired" . "dired-x") ("c" . "ccmode") "viper") "List of Info files that describe Emacs commands. An element can be a file name, or a list of the form (PREFIX . FILE)