diff options
| author | Paul Eggert | 2017-08-12 08:52:25 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-08-12 08:52:53 -0700 |
| commit | bbf52c142afbb9e10bf2ae20b3c77993fda26b43 (patch) | |
| tree | 2b2e9d7da0da52f74225fbafed6d875cc27c39ce | |
| parent | a685d9d7591df5b85c433940bbfaad283a82c495 (diff) | |
| download | emacs-bbf52c142afbb9e10bf2ae20b3c77993fda26b43.tar.gz emacs-bbf52c142afbb9e10bf2ae20b3c77993fda26b43.zip | |
Adjust jka-compr to recent Tramp changes.
* lisp/jka-compr.el (jka-compr-write-region):
Two new args LOCKNAME and MUSTBENEW.
| -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 `/'." | |||
| 252 | "This routine will return the name of a new file." | 252 | "This routine will return the name of a new file." |
| 253 | (make-temp-file jka-compr-temp-name-template)) | 253 | (make-temp-file jka-compr-temp-name-template)) |
| 254 | 254 | ||
| 255 | (defun jka-compr-write-region (start end file &optional append visit) | 255 | (defun jka-compr-write-region (start end file &optional |
| 256 | append visit lockname mustbenew) | ||
| 256 | (let* ((filename (expand-file-name file)) | 257 | (let* ((filename (expand-file-name file)) |
| 257 | (visit-file (if (stringp visit) (expand-file-name visit) filename)) | 258 | (visit-file (if (stringp visit) (expand-file-name visit) filename)) |
| 258 | (info (jka-compr-get-compression-info visit-file)) | 259 | (info (jka-compr-get-compression-info visit-file)) |
| @@ -334,7 +335,8 @@ There should be no more than seven characters after the final `/'." | |||
| 334 | (jka-compr-run-real-handler 'write-region | 335 | (jka-compr-run-real-handler 'write-region |
| 335 | (list (point-min) (point-max) | 336 | (list (point-min) (point-max) |
| 336 | filename | 337 | filename |
| 337 | (and append can-append) 'dont)) | 338 | (and append can-append) 'dont |
| 339 | lockname mustbenew)) | ||
| 338 | (erase-buffer)) ) | 340 | (erase-buffer)) ) |
| 339 | 341 | ||
| 340 | (delete-file temp-file) | 342 | (delete-file temp-file) |
| @@ -365,7 +367,8 @@ There should be no more than seven characters after the final `/'." | |||
| 365 | nil) | 367 | nil) |
| 366 | 368 | ||
| 367 | (jka-compr-run-real-handler 'write-region | 369 | (jka-compr-run-real-handler 'write-region |
| 368 | (list start end filename append visit))))) | 370 | (list start end filename append visit |
| 371 | lockname mustbenew))))) | ||
| 369 | 372 | ||
| 370 | 373 | ||
| 371 | (defun jka-compr-insert-file-contents (file &optional visit beg end replace) | 374 | (defun jka-compr-insert-file-contents (file &optional visit beg end replace) |