aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2012-10-01 04:45:25 +0200
committerJuanma Barranquero2012-10-01 04:45:25 +0200
commitea9a35630ab737fac2f56b43d38b47e186f82379 (patch)
treed19534a3d4b42a5b0042baf59a40419e605ae3ed
parent6e6c9cd2e916757534bca94f6dadf99d368bda25 (diff)
downloademacs-ea9a35630ab737fac2f56b43d38b47e186f82379.tar.gz
emacs-ea9a35630ab737fac2f56b43d38b47e186f82379.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ido.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b82a6e2e580..37985d5ee38 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-10-01 Juanma Barranquero <lekktu@gmail.com>
2
3 * ido.el (ido-directory-too-big-p): Pass dir through file-truename
4 to get the correct size across symlinks.
5
12012-09-30 Juanma Barranquero <lekktu@gmail.com> 62012-09-30 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * ido.el (ido-buffer-disable-smart-matches): Fix typo in docstring. 8 * ido.el (ido-buffer-disable-smart-matches): Fix typo in docstring.
diff --git a/lisp/ido.el b/lisp/ido.el
index 4de4618ef46..70245800121 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1720,7 +1720,7 @@ This function also adds a hook to the minibuffer."
1720 (ido-final-slash dir) 1720 (ido-final-slash dir)
1721 (not (ido-is-unc-host dir)) 1721 (not (ido-is-unc-host dir))
1722 (file-directory-p dir) 1722 (file-directory-p dir)
1723 (> (nth 7 (file-attributes dir)) ido-max-directory-size)))) 1723 (> (nth 7 (file-attributes (file-truename dir))) ido-max-directory-size))))
1724 1724
1725(defun ido-set-current-directory (dir &optional subdir no-merge) 1725(defun ido-set-current-directory (dir &optional subdir no-merge)
1726 ;; Set ido's current directory to DIR or DIR/SUBDIR 1726 ;; Set ido's current directory to DIR or DIR/SUBDIR