[Emacs-diffs] /srv/bzr/emacs/trunk r105155: (Info-find-file): Fall back on the installation directory if we can't find the info node anywhere else.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105155
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 15:10:54 +0200
message:
  (Info-find-file): Fall back on the installation directory if we can't find 
the info node anywhere else.
modified:
  lisp/ChangeLog
  lisp/info.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-13 07:58:34 +0000
+++ b/lisp/ChangeLog    2011-07-13 13:10:54 +0000
@@ -1,3 +1,8 @@
+2011-07-13  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * vc/vc.el (vc-revert-file):

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2011-07-07 20:35:28 +0000
+++ b/lisp/info.el      2011-07-13 13:10:54 +0000
@@ -728,6 +728,11 @@
                          (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)))