* dired-aux.el (dired-touch-initial): Just use current-time. (Bug#6887)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cde1e6d6a48cb1701d0a7f1be5f83ea7563fc38e..c5a232e0ec309a589b9b4c090f21dd8a27a1a583 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-21  Glenn Morris  <rgm@gnu.org>
 
+       * dired-aux.el (dired-touch-initial): Just use current-time.  (Bug#6887)
+
        * wid-edit.el (widget-checklist-match-inline):
        Fix 2011-04-19 change.  (Bug#8649)
 

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 059a635cdeda47c7c6b7db8336c647882d9ac6ae..8e4b3b5c6a68b8d8a55af5a8b4550f498569d135 100644 (file)
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -229,14 +229,17 @@ List has a form of (file-name full-file-name (attribute-list))."
 
 (defun dired-touch-initial (files)
   "Create initial input value for `touch' command."
-  (let (initial)
-    (while files
-      (let ((current (nth 5 (file-attributes (car files)))))
-        (if (and initial (not (equal initial current)))
-            (setq initial (current-time) files nil)
-          (setq initial current))
-        (setq files (cdr files))))
-    (format-time-string "%Y%m%d%H%M.%S" initial)))
+  ;; Nobody can explain what this version is supposed to do.  (Bug#6887)
+  ;; Also, the manual says it uses "the present time".
+  ;;; (let (initial)
+  ;;;   (while files
+  ;;;     (let ((current (nth 5 (file-attributes (car files)))))
+  ;;;       (if (and initial (not (equal initial current)))
+  ;;;           (setq initial (current-time) files nil)
+  ;;;         (setq initial current))
+  ;;;       (setq files (cdr files))))
+  ;;;   (format-time-string "%Y%m%d%H%M.%S" initial)))
+  (format-time-string "%Y%m%d%H%M.%S" (current-time)))
 
 (defun dired-do-chxxx (attribute-name program op-symbol arg)
   ;; Change file attributes (mode, group, owner, timestamp) of marked files and