diff options
author | Andrea Corallo <akrl@sdf.org> | 2020-10-23 20:08:58 +0100 |
---|---|---|
committer | Andrea Corallo <akrl@sdf.org> | 2020-10-23 20:08:58 +0100 |
commit | 99e7cc0da652bf0f19f691d5de3b3ce7c15e8c39 (patch) | |
tree | e7c4921579cfeac379b649f27c2da78fed8aae48 /lisp/international/mule.el | |
parent | 3be93390fb6680d1e0c3256af72c86635a9eb327 (diff) | |
parent | 46f5d2867cf73a845d582eeb8929ae51b78eae55 (diff) | |
download | emacs-99e7cc0da652bf0f19f691d5de3b3ce7c15e8c39.tar.gz |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/international/mule.el')
-rw-r--r-- | lisp/international/mule.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 607287f59cd..5292abfb798 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1711,8 +1711,8 @@ in-place." ;; self-extracting exe archives. (mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg))) '(("\\.\\(\ -arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|\ -ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" +arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|squashfs\\|\ +ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\|SQUASHFS\\)\\'" . no-conversion-multibyte) ("\\.\\(exe\\|EXE\\)\\'" . no-conversion) ("\\.\\(sx[dmicw]\\|odt\\|tar\\|t[bg]z\\)\\'" . no-conversion) |