Re: Cancelled copies marked 'C' in Dired

[Richard Stallman]

Do you get correct results with this change?

Index: dired-aux.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dired-aux.el,v
retrieving revision 1.148
retrieving revision 1.149
diff -c -c -r1.148 -r1.149
*** dired-aux.el        18 Oct 2006 10:50:28 -0000      1.148
--- dired-aux.el        5 Nov 2006 15:00:31 -0000       1.149
***************
*** 1182,1193 ****
                       dired-create-files-failures)
                 (setq files nil)
                 (dired-log "Copying error for %s:\n%s\n" from err)))))
!         (while files
!           (dired-copy-file-recursive
!            (expand-file-name (car files) from)
!            (expand-file-name (car files) to)
!            ok-flag preserve-time nil recursive)
!           (pop files)))
        ;; Not a directory.
        (or top (dired-handle-overwrite to))
        (condition-case err
--- 1182,1201 ----
                       dired-create-files-failures)
                 (setq files nil)
                 (dired-log "Copying error for %s:\n%s\n" from err)))))
!         (dolist (file files)
!           (let ((thisfrom (expand-file-name file from))
!                 (thisto (expand-file-name file to)))
!             ;; Catch errors copying within a directory,
!             ;; and report them through the dired log mechanism
!             ;; just as our caller will do for the top level files.
!             (condition-case err
!                 (dired-copy-file-recursive
!                  thisfrom thisto
!                  ok-flag preserve-time nil recursive)
!               (file-error
!                (push (dired-make-relative thisfrom)
!                      dired-create-files-failures)
!                (dired-log "Copying error for %s:\n%s\n" thisfrom err))))))
        ;; Not a directory.
        (or top (dired-handle-overwrite to))
        (condition-case err
***************
*** 1198,1208 ****
        (file-date-error 
         (push (dired-make-relative from)
               dired-create-files-failures)
!        (dired-log "Can't set date on %s:\n%s\n" from err))
!       (file-error
!        (push (dired-make-relative from)
!              dired-create-files-failures)
!        (dired-log "Copying error for %s:\n%s\n" from err))))))
  
  ;;;###autoload
  (defun dired-rename-file (file newname ok-if-already-exists)
--- 1206,1212 ----
        (file-date-error 
         (push (dired-make-relative from)
               dired-create-files-failures)
!        (dired-log "Can't set date on %s:\n%s\n" from err))))))
  
  ;;;###autoload
  (defun dired-rename-file (file newname ok-if-already-exists)