From b2c99afe4d6f855176b0e709169ea20c0f8bac55 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 13 Nov 2008 05:03:33 +0000 Subject: [PATCH] Remove some charset code not needed since Emacs 22. --- lisp/ChangeLog | 4 ++++ lisp/nxml/nxml-enc.el | 23 +---------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 725ca428d3a..1062ce59fa2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-11-13 Glenn Morris + + * nxml/nxml-enc.el: Remove some charset code not needed since Emacs 22. + 2008-11-13 Henry Weller (tiny change) * net/mairix.el (mairix-widget-fields-list): Fix bug regarding searching diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el index 26d028becf4..5890f1c0e57 100644 --- a/lisp/nxml/nxml-enc.el +++ b/lisp/nxml/nxml-enc.el @@ -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 -- 2.39.2