*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b82a6e2e580aa278edd84c05456a6f03dbf35a15..37985d5ee382af8dd89813f62a8176bbf59bd061 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-01  Juanma Barranquero  <lekktu@gmail.com>
+
+       * ido.el (ido-directory-too-big-p): Pass dir through file-truename
+       to get the correct size across symlinks.
+
 2012-09-30  Juanma Barranquero  <lekktu@gmail.com>
 
        * ido.el (ido-buffer-disable-smart-matches): Fix typo in docstring.

diff --git a/lisp/ido.el b/lisp/ido.el
index 4de4618ef46a4f386f999fb3b0fa0138b0cba461..702458001215179cfb54c88d24d68e6430dc233f 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1720,7 +1720,7 @@ This function also adds a hook to the minibuffer."
         (ido-final-slash dir)
         (not (ido-is-unc-host dir))
         (file-directory-p dir)
-        (> (nth 7 (file-attributes dir)) ido-max-directory-size))))
+        (> (nth 7 (file-attributes (file-truename dir))) ido-max-directory-size))))
 
 (defun ido-set-current-directory (dir &optional subdir no-merge)
   ;; Set ido's current directory to DIR or DIR/SUBDIR