aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2012-03-05 22:00:52 -0500
committerGlenn Morris2012-03-05 22:00:52 -0500
commit17798e786eacd4875146b240ced84d61047ec83a (patch)
tree6c7e27fb88bca13d3ecffbb87e6d95714145c883
parent8f2114eef3d9efca0f5de7076a165d104c47fc1e (diff)
downloademacs-17798e786eacd4875146b240ced84d61047ec83a.tar.gz
emacs-17798e786eacd4875146b240ced84d61047ec83a.zip
* lisp/info.el (Info-insert-dir): Also try "dir.gz".
Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00005.html
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/info.el2
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4d5a146490..6a9b1808cdf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-03-06 Thien-Thi Nguyen <ttn@gnuvola.org>
2
3 * info.el (Info-insert-dir): Also try "dir.gz".
4
12012-03-06 Glenn Morris <rgm@gnu.org> 52012-03-06 Glenn Morris <rgm@gnu.org>
2 6
3 * files.el (dir-locals-find-file): 7 * files.el (dir-locals-find-file):
diff --git a/lisp/info.el b/lisp/info.el
index a8cb141114c..8965b2c45c9 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1165,6 +1165,8 @@ a case-insensitive match is tried."
1165 (progn (setq file (expand-file-name "dir.info" truename)) 1165 (progn (setq file (expand-file-name "dir.info" truename))
1166 (file-attributes file)) 1166 (file-attributes file))
1167 (progn (setq file (expand-file-name "DIR.INFO" truename)) 1167 (progn (setq file (expand-file-name "DIR.INFO" truename))
1168 (file-attributes file))
1169 (progn (setq file (expand-file-name "dir.gz" truename))
1168 (file-attributes file))))) 1170 (file-attributes file)))))
1169 (setq dirs-done 1171 (setq dirs-done
1170 (cons truename 1172 (cons truename