diff options
| author | Sam Steingold <sds@gnu.org> | 2011-02-01 16:37:12 -0500 |
|---|---|---|
| committer | Sam Steingold <sds@gnu.org> | 2011-02-01 16:37:12 -0500 |
| commit | e8e4d5c88e04390481b3156c0e5efe40979d8519 (patch) | |
| tree | 91e183a5d20a036e1e03c544e693adfa8b09ec73 /lisp/international | |
| parent | abef340a0c5304054a2a5e6d95e1d825501f0e7a (diff) | |
undo 2011-02-01T18:15:18Z!sds@gnu.org (purecopy-cons, purecopy-car) at Stefan Monnier's request
Diffstat (limited to 'lisp/international')
| -rw-r--r-- | lisp/international/fontset.el | 3 | ||||
| -rw-r--r-- | lisp/international/mule-conf.el | 2 | ||||
| -rw-r--r-- | lisp/international/mule.el | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index da82a15468b..777779e5ec5 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -33,7 +33,8 @@ ;; Setup font-encoding-alist for all known encodings. (setq font-encoding-alist - (mapcar 'purecopy-car + (mapcar (lambda (arg) + (cons (purecopy (car arg)) (cdr arg))) '(("iso8859-1$" . iso-8859-1) ("iso8859-2$" . iso-8859-2) ("iso8859-3$" . iso-8859-3) diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index 55a96b6cca1..9ba95e4d11a 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -1505,7 +1505,7 @@ for decoding and encoding files, process I/O, etc." ;; Tar files are not decoded at all, but we treat them as raw bytes. (setq file-coding-system-alist - (mapcar 'purecopy-car + (mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg))) '(("\\.elc\\'" . utf-8-emacs) ("\\.utf\\(-8\\)?\\'" . utf-8) ("\\.xml\\'" . xml-find-file-coding-system) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 2da15b5f9bd..4a387a233a0 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1671,11 +1671,11 @@ in-place." (defcustom auto-coding-alist ;; .exe and .EXE are added to support archive-mode looking at DOS ;; self-extracting exe archives. - (mapcar 'purecopy-car - '(("\\.\\(\ + (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) + . no-conversion-multibyte) ("\\.\\(exe\\|EXE\\)\\'" . no-conversion) ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion) ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion) @@ -1696,7 +1696,7 @@ and the contents of `file-coding-system-alist'." (symbol :tag "Coding system")))) (defcustom auto-coding-regexp-alist - (mapcar 'purecopy-car + (mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg))) '(("\\`BABYL OPTIONS:[ \t]*-\\*-[ \t]*rmail[ \t]*-\\*-" . no-conversion) ("\\`\xFE\xFF" . utf-16be-with-signature) ("\\`\xFF\xFE" . utf-16le-with-signature) |