Revert the FOLLOW-SYMLINKS change for file-attributes.

3 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b6fa3f8d21..e683650856c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2012-10-01  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Revert the FOLLOW-SYMLINKS change for file-attributes.
+        * files.el (remote-file-name-inhibit-cache, after-find-file):
+        * time.el (display-time-file-nonempty-p): Undo last change.
+
         * profiler.el (profiler-sampling-interval): Change default back to 1.
         See Stefan Monnier in
         <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00863.html>.
diff --git a/lisp/files.el b/lisp/files.el
index 8bc02d08f6f..76a13f6cefd 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1014,7 +1014,7 @@ consecutive checks.  For example:
   (defun display-time-file-nonempty-p (file)
     (let ((remote-file-name-inhibit-cache (- display-time-interval 5)))
       (and (file-exists-p file)
-           (< 0 (nth 7 (file-attributes file nil t))))))"
+           (< 0 (nth 7 (file-attributes (file-chase-links file)))))))"
   :group 'files
   :version "24.1"
   :type `(choice
@@ -2082,7 +2082,8 @@ unless NOMODES is non-nil."
              ((and error (file-attributes buffer-file-name))
               (setq buffer-read-only t)
               (if (and (file-symlink-p buffer-file-name)
-                       (not (file-exists-p buffer-file-name)))
+                       (not (file-exists-p
+                             (file-chase-links buffer-file-name))))
                   "Symbolic link that points to nonexistent file"
                 "File exists, but cannot be read"))
              ((not buffer-read-only)
diff --git a/lisp/time.el b/lisp/time.el
index 7c0deadecfd..fe3cdbb57be 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -485,7 +485,7 @@ update which can wait for the next redisplay."
 (defun display-time-file-nonempty-p (file)
   (let ((remote-file-name-inhibit-cache (- display-time-interval 5)))
     (and (file-exists-p file)
-         (< 0 (nth 7 (file-attributes file nil t))))))
+         (< 0 (nth 7 (file-attributes (file-chase-links file)))))))
 
 ;;;###autoload
 (define-minor-mode display-time-mode