diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-12 08:52:25 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-12 08:52:53 -0700 |
| commit | bbf52c142afbb9e10bf2ae20b3c77993fda26b43 (patch) | |
| tree | 2b2e9d7da0da52f74225fbafed6d875cc27c39ce /lisp/jka-compr.el | |
| parent | a685d9d7591df5b85c433940bbfaad283a82c495 (diff) | |
| download | emacs-bbf52c142afbb9e10bf2ae20b3c77993fda26b43.tar.gz | |
Adjust jka-compr to recent Tramp changes.
* lisp/jka-compr.el (jka-compr-write-region):
Two new args LOCKNAME and MUSTBENEW.
Diffstat (limited to 'lisp/jka-compr.el')
| -rw-r--r-- | lisp/jka-compr.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 26a7cf506fd..9e780f82b31 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -252,7 +252,8 @@ There should be no more than seven characters after the final `/'." "This routine will return the name of a new file." (make-temp-file jka-compr-temp-name-template)) -(defun jka-compr-write-region (start end file &optional append visit) +(defun jka-compr-write-region (start end file &optional + append visit lockname mustbenew) (let* ((filename (expand-file-name file)) (visit-file (if (stringp visit) (expand-file-name visit) filename)) (info (jka-compr-get-compression-info visit-file)) @@ -334,7 +335,8 @@ There should be no more than seven characters after the final `/'." (jka-compr-run-real-handler 'write-region (list (point-min) (point-max) filename - (and append can-append) 'dont)) + (and append can-append) 'dont + lockname mustbenew)) (erase-buffer)) ) (delete-file temp-file) @@ -365,7 +367,8 @@ There should be no more than seven characters after the final `/'." nil) (jka-compr-run-real-handler 'write-region - (list start end filename append visit))))) + (list start end filename append visit + lockname mustbenew))))) (defun jka-compr-insert-file-contents (file &optional visit beg end replace) |