Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-219
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-139

1 files changed, 7 insertions, 1 deletions

diff --git a/src/dired.c b/src/dired.c
index f4102ff6edb..e833ceb216b 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -914,7 +914,13 @@ Elements of the attribute list are:
      call the corresponding file handler.  */
   handler = Ffind_file_name_handler (filename, Qfile_attributes);
   if (!NILP (handler))
-    return call3 (handler, Qfile_attributes, filename, id_format);
+    { /* Only pass the extra arg if it is used to help backward compatibility
+         with old file handlers which do not implement the new arg.  --Stef  */
+      if (NILP (id_format))
+        return call2 (handler, Qfile_attributes, filename);
+      else
+        return call3 (handler, Qfile_attributes, filename, id_format);
+    }
 
   encoded = ENCODE_FILE (filename);