[Emacs-diffs] Changes to emacs/lisp/nxml/nxml-enc.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/11/13 05:03:10

Index: nxml-enc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/nxml-enc.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- nxml-enc.el 31 Jul 2008 05:33:47 -0000      1.6
+++ nxml-enc.el 13 Nov 2008 05:03:10 -0000      1.7
@@ -139,32 +139,11 @@
       (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