[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108152: *** empty log message ***

[Juanma Barranquero]

------------------------------------------------------------
revno: 108152
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-10-01 04:45:25 +0200
message:
  *** empty log message ***
modified:
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-30 12:32:16 +0000
+++ b/lisp/ChangeLog    2012-10-01 02:45:25 +0000
@@ -1,3 +1,8 @@
+2012-10-01  Juanma Barranquero  <address@hidden>
+
+       * ido.el (ido-directory-too-big-p): Pass dir through file-truename
+       to get the correct size across symlinks.
+
 2012-09-30  Juanma Barranquero  <address@hidden>
 
        * ido.el (ido-buffer-disable-smart-matches): Fix typo in docstring.

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2012-09-30 12:32:16 +0000
+++ b/lisp/ido.el       2012-10-01 02:45:25 +0000
@@ -1720,7 +1720,7 @@
         (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