mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Remove some charset code not needed since Emacs 22.

Browse source
This commit is contained in:
Glenn Morris 2008-11-13 05:03:33 +00:00
parent 29c2869d40
commit b2c99afe4d
2 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2008-11-13 Glenn Morris <rgm@gnu.org>
* nxml/nxml-enc.el: Remove some charset code not needed since Emacs 22.
2008-11-13 Henry Weller <hweller0@gmail.com> (tiny change)
* net/mairix.el (mairix-widget-fields-list): Fix bug regarding searching

23
lisp/nxml/nxml-enc.el
View file

@ -139,32 +139,11 @@ Applied to any files that `auto-mode-alist' says should be handled by
(setq set-auto-coding-function nxml-non-xml-set-auto-coding-function)
(setq nxml-non-xml-set-auto-coding-function nil))))
(unless (coding-system-p 'us-ascii)
(make-coding-system
;; Unicode Emacs uses ?- last time I looked
'us-ascii 2 ?-
"ISO 2022 based 7-bit encoding for ASCII (MIME:US-ASCII)"
'(ascii)
'((safe-charsets ascii)
(mime-charset . us-ascii))))
;; Emacs 21.3.50 makes us-ascii an alias for iso-safe without
;; Emacs 22 makes us-ascii an alias for iso-safe without
;; giving it a mime-charset property.
(unless (coding-system-get 'us-ascii 'mime-charset)
(coding-system-put 'us-ascii 'mime-charset 'us-ascii))
;; Work around bug in Emacs 21.3
(when (and (coding-system-p 'utf-16-le)
(eq (coding-system-get 'utf-16-le 'pre-write-conversion)
'utf-16-le-pre-write-conversion))
(coding-system-put 'utf-16-le 'pre-write-conversion nil))
(when (and (coding-system-p 'utf-16-le)
(eq (coding-system-get 'utf-16-be 'pre-write-conversion)
'utf-16-be-pre-write-conversion))
(coding-system-put 'utf-16-be 'pre-write-conversion nil))
(provide 'nxml-enc)
;; arch-tag: c2436247-78f3-418c-8069-85dc5335d083