Commit dd31e4e8 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(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.
parent 0c80756e
...@@ -576,7 +576,9 @@ a case-insensitive match is tried." ...@@ -576,7 +576,9 @@ a case-insensitive match is tried."
;; Search file for a suitable node. ;; Search file for a suitable node.
(let ((guesspos (point-min)) (let ((guesspos (point-min))
(regexp (concat "\\(Node:\\|Ref:\\) *\\(" (regexp (concat "\\(Node:\\|Ref:\\) *\\("
(regexp-quote nodename) (if (stringp nodename)
(regexp-quote nodename)
"")
"\\) *[,\t\n\177]")) "\\) *[,\t\n\177]"))
(nodepos nil)) (nodepos nil))
...@@ -665,7 +667,10 @@ a case-insensitive match is tried." ...@@ -665,7 +667,10 @@ a case-insensitive match is tried."
(progn (progn
(insert Info-dir-contents) (insert Info-dir-contents)
(goto-char (point-min))) (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. ;; Bind this in case the user sets it to nil.
(case-fold-search t) (case-fold-search t)
;; This is set non-nil if we find a problem in some input files. ;; This is set non-nil if we find a problem in some input files.
...@@ -2167,7 +2172,7 @@ Allowed only if variable `Info-enable-edit' is non-nil." ...@@ -2167,7 +2172,7 @@ Allowed only if variable `Info-enable-edit' is non-nil."
(message "Tags may have changed. Use Info-tagify if necessary"))) (message "Tags may have changed. Use Info-tagify if necessary")))
(defvar Info-file-list-for-emacs (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") ("dired" . "dired-x") ("c" . "ccmode") "viper")
"List of Info files that describe Emacs commands. "List of Info files that describe Emacs commands.
An element can be a file name, or a list of the form (PREFIX . FILE) An element can be a file name, or a list of the form (PREFIX . FILE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment