[Emacs-diffs] Changes to emacs/lisp/dired-aux.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/07/17 04:00:54

Index: dired-aux.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired-aux.el,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- dired-aux.el        20 May 2006 18:18:58 -0000      1.145
+++ dired-aux.el        17 Jul 2006 04:00:54 -0000      1.146
@@ -745,12 +745,15 @@
           ;;; We don't recognize the file as compressed, so compress it.
           ;;; Try gzip; if we don't have that, use compress.
           (condition-case nil
-              (if (not (dired-check-process (concat "Compressing " file)
+              (let ((out-name (concat file ".gz")))
+                (and (or (not (file-exists-p out-name))
+                         (y-or-n-p
+                          (format "File %s already exists.  Really compress? "
+                                  out-name)))
+                     (not (dired-check-process (concat "Compressing " file)
                                             "gzip" "-f" file))
-                  (let ((out-name
-                         (if (file-exists-p (concat file ".gz"))
-                             (concat file ".gz")
-                           (concat file ".z"))))
+                     (or (file-exists-p out-name)
+                         (setq out-name (concat file ".z")))
                     ;; Rename the compressed file to NEWNAME
                     ;; if it hasn't got that name already.
                     (if (and newname (not (equal newname out-name)))