(Info-find-file): Fall back on the installation directory if we can't find the info...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2371c6f7c84b5657c6079197be253841cc59e09..d2bfdb90a403b0e6a7ad15a4323a4157fccd59bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * info.el (Info-find-file): Fall back on the installation
+       directory if we can't find the info node anywhere else.
+
 2011-07-13  Sergei Organov  <osv@javad.com>  (tiny change)
 
        * vc/vc.el (vc-revert-file):

diff --git a/lisp/info.el b/lisp/info.el
index 29daac566d10376607c8221c3929647625b0c991..9e67542cda58c08b297a1cb71829e54abeb7ba81 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -728,6 +728,11 @@ just return nil (no error)."
                          (append Info-directory-list
                                  Info-additional-directory-list)
                        Info-directory-list)))))
+       ;; Fall back on the installation directory if we can't find
+       ;; the info node anywhere else.
+       (when installation-directory
+         (setq dirs (append dirs (list (expand-file-name
+                                        "info" installation-directory)))))
        ;; Search the directory list for file FILENAME.
        (while (and dirs (not found))
          (setq temp (expand-file-name filename (car dirs)))