Revert the FOLLOW-SYMLINKS change for file-attributes.

11 files changed, 37 insertions, 34 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
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 0cd21f53a41..d8cb96e0f5e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Revert the FOLLOW-SYMLINKS change for file-attributes.
+        * NEWS: Undo last change.
+
 2012-09-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         file-attributes has a new optional arg FOLLOW-SYMLINKS.
diff --git a/etc/NEWS b/etc/NEWS
index 9a232fd0a5b..2791a25e051 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -807,11 +807,6 @@ The PSECS slot is new, and uses picosecond resolution.  It can be
 accessed via the new timer--psecs accessor.
 
 +++
-** file-attributes has a new optional argument FOLLOW-SYMLINKS
-that says whether to follow symbolic links.  The default, as before,
-is to not follow symlinks.
-
-+++
 ** Floating point functions now always return special values like NaN,
 instead of signaling errors, if given invalid args, e.g. (log -1.0).
 Previously, they returned NaNs on some platforms but signaled errors
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
diff --git a/src/ChangeLog b/src/ChangeLog
index 9704c6d4469..9ad044a570a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2012-10-01  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Revert the FOLLOW-SYMLINKS change for file-attributes.
+        Doing it right would require several changes to Tramp, and there's
+        not enough time to get that tested before the freeze today.
+        * dired.c (directory_files_internal, Ffile_attributes):
+        Undo last change.
+
         * frame.c (x_report_frame_params): Port better to wider ints.
         Do not assume that EMACS_UINT is the same width as uprintmax_t,
         or that pointers can be printed in 15 decimal digits.
diff --git a/src/dired.c b/src/dired.c
index 84a172deb58..4986f845101 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -110,13 +110,12 @@ directory_files_internal_unwind (Lisp_Object dh)
 /* Function shared by Fdirectory_files and Fdirectory_files_and_attributes.
    If not ATTRS, return a list of directory filenames;
    if ATTRS, return a list of directory filenames and their attributes.
-   In the latter case, ID_FORMAT and FOLLOW_SYMLINKS are passed to
-   Ffile_attributes.  */
+   In the latter case, ID_FORMAT is passed to Ffile_attributes.  */
 
 Lisp_Object
 directory_files_internal (Lisp_Object directory, Lisp_Object full,
                           Lisp_Object match, Lisp_Object nosort, bool attrs,
-                          Lisp_Object id_format, Lisp_Object follow_symlinks)
+                          Lisp_Object id_format)
 {
   DIR *d;
   ptrdiff_t directory_nbytes;
@@ -298,8 +297,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
 
                   /* Both Fexpand_file_name and Ffile_attributes can GC.  */
                   decoded_fullname = Fexpand_file_name (name, directory);
-                  fileattrs = Ffile_attributes (decoded_fullname, id_format,
-                                                follow_symlinks);
+                  fileattrs = Ffile_attributes (decoded_fullname, id_format);
 
                   list = Fcons (Fcons (finalname, fileattrs), list);
                   UNGCPRO;
@@ -352,8 +350,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
     return call5 (handler, Qdirectory_files, directory,
                   full, match, nosort);
 
-  return directory_files_internal (directory, full, match, nosort, 0,
-                                   Qnil, Qnil);
+  return directory_files_internal (directory, full, match, nosort, 0, Qnil);
 }
 
 DEFUN ("directory-files-and-attributes", Fdirectory_files_and_attributes,
@@ -381,8 +378,7 @@ which see.  */)
     return call6 (handler, Qdirectory_files_and_attributes,
                   directory, full, match, nosort, id_format);
 
-  return directory_files_internal (directory, full, match, nosort, 1,
-                                   id_format, Qnil);
+  return directory_files_internal (directory, full, match, nosort, 1, id_format);
 }
 
 
@@ -879,7 +875,7 @@ stat_gname (struct stat *st)
 #endif
 }
 
-DEFUN ("file-attributes", Ffile_attributes, Sfile_attributes, 1, 3, 0,
+DEFUN ("file-attributes", Ffile_attributes, Sfile_attributes, 1, 2, 0,
        doc: /* Return a list of attributes of file FILENAME.
 Value is nil if specified file cannot be opened.
 
@@ -888,9 +884,6 @@ below) - valid values are 'string and 'integer.  The latter is the
 default, but we plan to change that, so you should specify a non-nil value
 for ID-FORMAT if you use the returned uid or gid.
 
-Optional argument FOLLOW-SYMLINKS says whether to follow symbolic
-links.  If t, they are followed; if nil, they are not.
-
 Elements of the attribute list are:
  0. t for directory, string (name linked to) for symbolic link, or nil.
  1. Number of links to file.
@@ -924,7 +917,7 @@ which see.
 
 On some FAT-based filesystems, only the date of last access is recorded,
 so last access time will always be midnight of that day.  */)
-  (Lisp_Object filename, Lisp_Object id_format, Lisp_Object follow_symlinks)
+  (Lisp_Object filename, Lisp_Object id_format)
 {
   Lisp_Object values[12];
   Lisp_Object encoded;
@@ -960,10 +953,7 @@ so last access time will always be midnight of that day.  */)
   encoded = ENCODE_FILE (filename);
   UNGCPRO;
 
-  if ((!NILP (follow_symlinks)
-       ? stat (SSDATA (encoded), &s)
-       : lstat (SSDATA (encoded), &s))
-      != 0)
+  if (lstat (SSDATA (encoded), &s) < 0)
     return Qnil;
 
   values[0] = (S_ISLNK (s.st_mode) ? Ffile_symlink_p (filename)
diff --git a/src/lisp.h b/src/lisp.h
index e182d3bc14b..c3cabe0af29 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3474,7 +3474,7 @@ extern void syms_of_ccl (void);
 extern void syms_of_dired (void);
 extern Lisp_Object directory_files_internal (Lisp_Object, Lisp_Object,
                                              Lisp_Object, Lisp_Object,
-                                             bool, Lisp_Object, Lisp_Object);
+                                             bool, Lisp_Object);
 
 /* Defined in term.c.  */
 extern int *char_ins_del_vector;
diff --git a/src/sysdep.c b/src/sysdep.c
index efebb49870c..a825145c6dd 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2532,8 +2532,7 @@ list_system_processes (void)
      process.  */
   procdir = build_string ("/proc");
   match = build_string ("[0-9]+");
-  proclist = directory_files_internal (procdir, Qnil, match, Qt, 0,
-                                       Qnil, Qnil);
+  proclist = directory_files_internal (procdir, Qnil, match, Qt, 0, Qnil);
 
   /* `proclist' gives process IDs as strings.  Destructively convert
      each string into a number.  */