diff options
| author | Lars Magne Ingebrigtsen | 2011-07-13 15:10:54 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-13 15:10:54 +0200 |
| commit | 1c4dd947d6d684b2d3c3dc298f2ee09e8fc0308b (patch) | |
| tree | d1863f54f03ae07aace67c33cce09bb104ad1244 /lisp | |
| parent | 2ad77c9dd4d29f1df663b27eb41f9257bfb59bfb (diff) | |
| download | emacs-1c4dd947d6d684b2d3c3dc298f2ee09e8fc0308b.tar.gz emacs-1c4dd947d6d684b2d3c3dc298f2ee09e8fc0308b.zip | |
(Info-find-file): Fall back on the installation directory if we can't find the info node anywhere else.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/info.el | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2371c6f7c8..d2bfdb90a40 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * info.el (Info-find-file): Fall back on the installation | ||
| 4 | directory if we can't find the info node anywhere else. | ||
| 5 | |||
| 1 | 2011-07-13 Sergei Organov <osv@javad.com> (tiny change) | 6 | 2011-07-13 Sergei Organov <osv@javad.com> (tiny change) |
| 2 | 7 | ||
| 3 | * vc/vc.el (vc-revert-file): | 8 | * vc/vc.el (vc-revert-file): |
diff --git a/lisp/info.el b/lisp/info.el index 29daac566d1..9e67542cda5 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -728,6 +728,11 @@ just return nil (no error)." | |||
| 728 | (append Info-directory-list | 728 | (append Info-directory-list |
| 729 | Info-additional-directory-list) | 729 | Info-additional-directory-list) |
| 730 | Info-directory-list))))) | 730 | Info-directory-list))))) |
| 731 | ;; Fall back on the installation directory if we can't find | ||
| 732 | ;; the info node anywhere else. | ||
| 733 | (when installation-directory | ||
| 734 | (setq dirs (append dirs (list (expand-file-name | ||
| 735 | "info" installation-directory))))) | ||
| 731 | ;; Search the directory list for file FILENAME. | 736 | ;; Search the directory list for file FILENAME. |
| 732 | (while (and dirs (not found)) | 737 | (while (and dirs (not found)) |
| 733 | (setq temp (expand-file-name filename (car dirs))) | 738 | (setq temp (expand-file-name filename (car dirs))) |