1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00

Merge branch 'scratch/no-purespace' into 'master'

This commit is contained in:
Stefan Kangas 2025-02-01 04:56:52 +01:00
commit bf97946d7d
181 changed files with 2108 additions and 9370 deletions

View file

@ -78,19 +78,18 @@ Otherwise, it is nil.")
(defun jka-compr-build-file-regexp ()
(purecopy
(let ((re-anchored '())
(re-free '()))
(dolist (e jka-compr-compression-info-list)
(let ((re (jka-compr-info-regexp e)))
(if (string-match "\\\\'\\'" re)
(push (substring re 0 (match-beginning 0)) re-anchored)
(push re re-free))))
(concat
(if re-free (concat (mapconcat 'identity re-free "\\|") "\\|"))
"\\(?:"
(mapconcat 'identity re-anchored "\\|")
"\\)" file-name-version-regexp "?\\'"))))
(let ((re-anchored '())
(re-free '()))
(dolist (e jka-compr-compression-info-list)
(let ((re (jka-compr-info-regexp e)))
(if (string-match "\\\\'\\'" re)
(push (substring re 0 (match-beginning 0)) re-anchored)
(push re re-free))))
(concat
(if re-free (concat (mapconcat 'identity re-free "\\|") "\\|"))
"\\(?:"
(mapconcat 'identity re-anchored "\\|")
"\\)" file-name-version-regexp "?\\'")))
;; Functions for accessing the return value of jka-compr-get-compression-info
;; FIXME: Use cl-defstruct!
@ -202,7 +201,6 @@ options through Custom does this automatically."
;; uncomp-message uncomp-prog uncomp-args
;; can-append strip-extension-flag file-magic-bytes
;; uncompress-function]
(mapcar 'purecopy
`(["\\.Z\\'"
"compressing" "compress" ("-c")
;; gzip is more common than uncompress. It can only read, not write.
@ -261,7 +259,7 @@ options through Custom does this automatically."
["\\.tzst\\'"
"zstd compressing" "zstd" ("-c" "-q")
"zstd uncompressing" "zstd" ("-c" "-q" "-d")
t nil "\050\265\057\375"]))
t nil "\050\265\057\375"])
"List of vectors that describe available compression techniques.
Each element, which describes a compression technique, is a vector of
@ -329,10 +327,10 @@ variables. Setting this through Custom does that automatically."
:group 'jka-compr)
(defcustom jka-compr-mode-alist-additions
(purecopy '(("\\.tgz\\'" . tar-mode)
("\\.tbz2?\\'" . tar-mode)
("\\.txz\\'" . tar-mode)
("\\.tzst\\'" . tar-mode)))
'(("\\.tgz\\'" . tar-mode)
("\\.tbz2?\\'" . tar-mode)
("\\.txz\\'" . tar-mode)
("\\.tzst\\'" . tar-mode))
"List of pairs added to `auto-mode-alist' when installing jka-compr.
Uninstalling jka-compr removes all pairs from `auto-mode-alist' that
installing added.
@ -346,7 +344,7 @@ variables. Setting this through Custom does that automatically."
:set 'jka-compr-set
:group 'jka-compr)
(defcustom jka-compr-load-suffixes (purecopy '(".gz"))
(defcustom jka-compr-load-suffixes '(".gz")
"List of compression related suffixes to try when loading files.
Enabling Auto Compression mode appends this list to `load-file-rep-suffixes',
which see. Disabling Auto Compression mode removes all suffixes