HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* simple.el (current-kill): Clarify what `interprogram-paste-function' does.
[bpt/emacs.git]
/
lisp
/
jka-compr.el
diff --git
a/lisp/jka-compr.el
b/lisp/jka-compr.el
index
6df57d7
..
cd76988
100644
(file)
--- a/
lisp/jka-compr.el
+++ b/
lisp/jka-compr.el
@@
-1,7
+1,6
@@
;;; jka-compr.el --- reading/writing/loading compressed files
;;; 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
;; 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"
(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
(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
prog
(mapconcat 'identity args " ")
err-file
@@
-181,8
+183,7
@@
to keep: LEN chars starting BEG chars from the beginning."
null-device))
jka-compr-acceptable-retval-list)
(jka-compr-error prog args infile message err-file))
null-device))
jka-compr-acceptable-retval-list)
(jka-compr-error prog args infile message err-file))
- (let (delete-by-moving-to-trash)
- (delete-file err-file))))
+ (delete-file err-file)))
;; Run the uncompression program directly.
;; We get the whole file and must delete what we don't want.
;; Run the uncompression program directly.
;; We get the whole file and must delete what we don't want.
@@
-224,8
+225,7
@@
to keep: LEN chars starting BEG chars from the beginning."
"")))
jka-compr-acceptable-retval-list)
(jka-compr-error prog args infile message err-file))
"")))
jka-compr-acceptable-retval-list)
(jka-compr-error prog args infile message err-file))
- (let (delete-by-moving-to-trash)
- (delete-file err-file))))
+ (delete-file err-file)))
(or (eq 0
(apply 'call-process
prog infile (if (stringp output) temp output)
(or (eq 0
(apply 'call-process
prog infile (if (stringp output) temp output)
@@
-247,7
+247,7
@@
There should be no more than seven characters after the final `/'."
:type 'string
:group 'jka-compr)
: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))
"This routine will return the name of a new file."
(make-temp-file jka-compr-temp-name-template))
@@
-309,6
+309,7
@@
There should be no more than seven characters after the final `/'."
(and
compress-message
(and
compress-message
+ jka-compr-verbose
(message "%s %s..." compress-message base-name))
(jka-compr-run-real-handler 'write-region
(message "%s %s..." compress-message base-name))
(jka-compr-run-real-handler 'write-region
@@
-337,11
+338,11
@@
There should be no more than seven characters after the final `/'."
(and append can-append) 'dont))
(erase-buffer)) )
(and append can-append) 'dont))
(erase-buffer)) )
- (let (delete-by-moving-to-trash)
- (delete-file temp-file))
+ (delete-file temp-file)
(and
compress-message
(and
compress-message
+ jka-compr-verbose
(message "%s %s...done" compress-message base-name))
(cond
(message "%s %s...done" compress-message base-name))
(cond
@@
-405,6
+406,7
@@
There should be no more than seven characters after the final `/'."
(and
uncompress-message
(and
uncompress-message
+ jka-compr-verbose
(message "%s %s..." uncompress-message base-name))
(condition-case error-code
(message "%s %s..." uncompress-message base-name))
(condition-case error-code
@@
-480,6
+482,7
@@
There should be no more than seven characters after the final `/'."
(and
uncompress-message
(and
uncompress-message
+ jka-compr-verbose
(message "%s %s...done" uncompress-message base-name))
(and
(message "%s %s...done" uncompress-message base-name))
(and
@@
-535,6
+538,7
@@
There should be no more than seven characters after the final `/'."
(and
uncompress-message
(and
uncompress-message
+ jka-compr-verbose
(message "%s %s..." uncompress-message base-name))
;; Here we must read the output of uncompress program
(message "%s %s..." uncompress-message base-name))
;; Here we must read the output of uncompress program
@@
-555,6
+559,7
@@
There should be no more than seven characters after the final `/'."
(and
uncompress-message
(and
uncompress-message
+ jka-compr-verbose
(message "%s %s...done" uncompress-message base-name))
(write-region
(message "%s %s...done" uncompress-message base-name))
(write-region
@@
-573,7
+578,7
@@
There should be no more than seven characters after the final `/'."
;; Support for loading compressed files.
;; 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))
"Documented as original."
(let* ((local-copy (jka-compr-file-local-copy file))
@@
-604,8
+609,7
@@
There should be no more than seven characters after the final `/'."
(setq file (file-name-sans-extension file)))
(setcar l file)))
(setq file (file-name-sans-extension file)))
(setcar l file)))
- (let (delete-by-moving-to-trash)
- (delete-file local-copy)))
+ (delete-file local-copy))
t))
t))
@@
-705,5
+709,4
@@
by `jka-compr-installed'."
(provide 'jka-compr)
(provide 'jka-compr)
-;; arch-tag: 3f15b630-e9a7-46c4-a22a-94afdde86ebc
;;; jka-compr.el ends here
;;; jka-compr.el ends here