summaryrefslogtreecommitdiff
path: root/lisp/international/mule.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-05-08 14:47:07 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2010-05-08 14:47:07 -0400
commit0235128c15aabd21b37e7a359b4932709471f156 (patch)
tree4f32e3a638c4e3d6e7d9c232b3e0b4b939368f54 /lisp/international/mule.el
parentca63fca5b669d42d8c131a1f33446d9a9d7795f6 (diff)
parent19ae0deb1c8c9475eb81daf7876cec5a44b5d5e0 (diff)
downloademacs-0235128c15aabd21b37e7a359b4932709471f156.tar.gz
Merge from emacs-23
Diffstat (limited to 'lisp/international/mule.el')
-rw-r--r--lisp/international/mule.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index ac33d26779f..ef3ef1e2efa 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1690,7 +1690,8 @@ and convert it in the temporary buffer. Otherwise, convert in-place."
(defcustom auto-coding-alist
;; .exe and .EXE are added to support archive-mode looking at DOS
;; self-extracting exe archives.
- (purecopy '(("\\.\\(\
+ (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\\)\\'"
. no-conversion-multibyte)