procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/tar-mode.el (tar--try-jka-compr): Remove. (Bug#34251)

Browse source 
(tar-extract): Call archive-try-jka-compr instead of tar--try-jka-compr.

* lisp/arc-mode.el (archive-try-jka-compr): Call set-buffer-multibyte
after erase-buffer.
This commit is contained in:
Juri Linkov 2019-02-17 23:07:43 +02:00
parent adeea448bc
commit 4f24b4a6df
2 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/arc-mode.el
View file

@ -967,8 +967,8 @@ using `make-temp-file', and the generated name is returned."
;; Don't re-compress this data just before decompressing it.
(jka-compr-inhibit t))
(write-region (point-min) (point-max) tmpfile nil 'quiet))
(set-buffer-multibyte t)
(erase-buffer)
(set-buffer-multibyte t)
(insert-file-contents tmpfile))
(delete-file tmpfile)))))

23
lisp/tar-mode.el
View file

@ -95,6 +95,7 @@
;;; Code:
(eval-when-compile (require 'cl-lib))
(require 'arc-mode)
(defgroup tar nil
"Simple editing of tar files."
@ -852,26 +853,6 @@ actually appear on disk when you save the tar-file's buffer."
(goto-char (posn-point (event-end event)))
(tar-extract))
(defun tar--try-jka-compr ()
(when (and auto-compression-mode
(jka-compr-get-compression-info buffer-file-name))
(let* ((basename (file-name-nondirectory buffer-file-name))
(tmpname (if (string-match ":\\([^:]+\\)\\'" basename)
(match-string 1 basename) basename))
(tmpfile (make-temp-file (file-name-sans-extension tmpname)
nil
(file-name-extension tmpname 'period))))
(unwind-protect
(progn
(let ((coding-system-for-write 'no-conversion)
;; Don't re-compress this data just before decompressing it.
(jka-compr-inhibit t))
(write-region (point-min) (point-max) tmpfile nil 'quiet))
(set-buffer-multibyte t)
(erase-buffer)
(insert-file-contents tmpfile))
(delete-file tmpfile)))))
(defun tar-file-name-handler (op &rest args)
"Helper function for `tar-extract'."
(or (eq op 'file-exists-p)
@ -951,7 +932,7 @@ actually appear on disk when you save the tar-file's buffer."
(setq buffer-file-name new-buffer-file-name)
(setq buffer-file-truename
(abbreviate-file-name buffer-file-name))
(tar--try-jka-compr) ;Pretty ugly hack :-(
(archive-try-jka-compr) ;Pretty ugly hack :-(
;; Force buffer-file-coding-system to what
;; decode-coding-region actually used.
(set-buffer-file-coding-system last-coding-system-used t)