Revert the FOLLOW-SYMLINKS change for file-attributes.

2 files changed, 8 insertions, 5 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 04b677b177e..db728d6fec0 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Revert the FOLLOW-SYMLINKS change for file-attributes.
+        * files.texi (File Attributes, Magic File Names): Undo last change.
+
 2012-09-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         file-attributes has a new optional arg FOLLOW-SYMLINKS.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 2b087208c60..9424a661236 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1187,7 +1187,7 @@ link to.
 @end example
 @end defun
 
-@defun file-attributes filename &optional id-format follow-symlinks
+@defun file-attributes filename &optional id-format
 @anchor{Definition of file-attributes}
 This function returns a list of attributes of file @var{filename}.  If
 the specified file cannot be opened, it returns @code{nil}.
@@ -1197,9 +1197,6 @@ valid values are @code{'string} and @code{'integer}.  The latter is
 the default, but we plan to change that, so you should specify a
 non-@code{nil} value for @var{id-format} if you use the returned
 @acronym{UID} or @acronym{GID}.
-The optional parameter @var{follow-symlinks} says whether to follow
-@var{filename} if it is a symbolic link; if @code{t}, symbolic links
-are followed and if @code{nil} they are not.
 
 The elements of the list, in order, are:
 
@@ -2964,7 +2961,8 @@ between consecutive checks.  For example:
   (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)))))))
 @end example
 @end defopt