mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-09-01 17:31:53 +00:00
Unconditionally prefer built-in decompression functions on Android
* lisp/jka-compr.el (jka-compr-insert-file-contents): Prefer built-in decompression functions (i.e., zlib) to external agents.
This commit is contained in:
parent
19b407ac74
commit
9c9afd5235
1 changed files with 11 additions and 4 deletions
|
@ -402,15 +402,22 @@ There should be no more than seven characters after the final `/'."
|
|||
(setq buffer-file-name filename))
|
||||
|
||||
(unwind-protect ; to make sure local-copy gets deleted
|
||||
|
||||
(progn
|
||||
|
||||
(and
|
||||
uncompress-message
|
||||
jka-compr-verbose
|
||||
(message "%s %s..." uncompress-message base-name))
|
||||
|
||||
(if (and (not (executable-find uncompress-program))
|
||||
(if (and (or (not (executable-find uncompress-program))
|
||||
;; Android ships a bespoke version of gzip
|
||||
;; that is absolutely useless for Emacs's
|
||||
;; purposes, not supporting decompression or
|
||||
;; reading input from elsewhere than stdin.
|
||||
;;
|
||||
;; This is only true of early releases of the
|
||||
;; OS, but, since zlib is always available on
|
||||
;; Android, simply unconditionally prefer the
|
||||
;; built-in decompression function.
|
||||
(eq system-type 'android))
|
||||
uncompress-function
|
||||
(fboundp uncompress-function))
|
||||
;; If we don't have the uncompression program, then use the
|
||||
|
|
Loading…
Reference in a new issue