From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 15 Apr 2004 21:02:33 +0000 (+0000)
Subject: (Ffile_attributes): Don't pass extra nil arg to file-handler.
X-Git-Tag: ttn-vms-21-2-B4~6804
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8e18df75ccbb4eef287b98981c90c1dd7565e64;p=emacs.git

(Ffile_attributes): Don't pass extra nil arg to file-handler.
---

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);