X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/4628bef1eea0f60e846fe6b6591725aa92952de9..f019fb210628549b661bf7ebaa40e136df205af4:/lisp/jka-compr.el

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 3f0ff54221..cd769885cc 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -1,7 +1,6 @@
 ;;; jka-compr.el --- reading/writing/loading compressed files
 
-;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1997, 1999-2011 Free Software Foundation, Inc.
 
 ;; Author: jka@ece.cmu.edu (Jay K. Adams)
 ;; Maintainer: FSF
@@ -166,8 +165,11 @@ to keep: LEN chars starting BEG chars from the beginning."
 	  (unwind-protect
 	      (or (memq (call-process
 			 jka-compr-shell infile t nil "-c"
+			 ;; Windows shells need the program file name
+			 ;; after the pipe symbol be quoted if they use
+			 ;; forward slashes as directory separators.
 			 (format
-			  "%s %s 2> %s | %s bs=%d skip=%d %s 2> %s"
+			  "%s %s 2> %s | \"%s\" bs=%d skip=%d %s 2> %s"
 			  prog
 			  (mapconcat 'identity args " ")
 			  err-file
@@ -245,7 +247,7 @@ There should be no more than seven characters after the final `/'."
   :type 'string
   :group 'jka-compr)
 
-(defun jka-compr-make-temp-name (&optional local-copy)
+(defun jka-compr-make-temp-name (&optional _local-copy)
   "This routine will return the name of a new file."
   (make-temp-file jka-compr-temp-name-template))
 
@@ -307,6 +309,7 @@ There should be no more than seven characters after the final `/'."
 
 	  (and
 	   compress-message
+	   jka-compr-verbose
 	   (message "%s %s..." compress-message base-name))
 
 	  (jka-compr-run-real-handler 'write-region
@@ -339,6 +342,7 @@ There should be no more than seven characters after the final `/'."
 
 	  (and
 	   compress-message
+	   jka-compr-verbose
 	   (message "%s %s...done" compress-message base-name))
 
 	  (cond
@@ -402,6 +406,7 @@ There should be no more than seven characters after the final `/'."
 
               (and
                uncompress-message
+	       jka-compr-verbose
                (message "%s %s..." uncompress-message base-name))
 
               (condition-case error-code
@@ -477,6 +482,7 @@ There should be no more than seven characters after the final `/'."
 
         (and
          uncompress-message
+	 jka-compr-verbose
          (message "%s %s...done" uncompress-message base-name))
 
         (and
@@ -532,6 +538,7 @@ There should be no more than seven characters after the final `/'."
 
 		(and
 		 uncompress-message
+		 jka-compr-verbose
 		 (message "%s %s..." uncompress-message base-name))
 
 		;; Here we must read the output of uncompress program
@@ -552,6 +559,7 @@ There should be no more than seven characters after the final `/'."
 
 		  (and
 		   uncompress-message
+		   jka-compr-verbose
 		   (message "%s %s...done" uncompress-message base-name))
 
 		  (write-region
@@ -570,7 +578,7 @@ There should be no more than seven characters after the final `/'."
 
 
 ;; Support for loading compressed files.
-(defun jka-compr-load (file &optional noerror nomessage nosuffix)
+(defun jka-compr-load (file &optional noerror nomessage _nosuffix)
   "Documented as original."
 
   (let* ((local-copy (jka-compr-file-local-copy file))
@@ -701,5 +709,4 @@ by `jka-compr-installed'."
 
 (provide 'jka-compr)
 
-;; arch-tag: 3f15b630-e9a7-46c4-a22a-94afdde86ebc
 ;;; jka-compr.el ends here