Mercurial > emacs

diff lisp/jka-compr.el @ 112330:56d3e9c28eb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Mon, 17 Jan 2011 11:01:01 -0800
parents ef719132ddfa
children
line wrap: on
line diff
--- a/lisp/jka-compr.el	Sun Jan 16 18:35:15 2011 -0800
+++ b/lisp/jka-compr.el	Mon Jan 17 11:01:01 2011 -0800
@@ -166,8 +166,11 @@
 	  (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
@@ -701,5 +704,4 @@
 
 (provide 'jka-compr)
 
-;; arch-tag: 3f15b630-e9a7-46c4-a22a-94afdde86ebc
 ;;; jka-compr.el ends here