;;; nxml-enc.el --- XML encoding auto-detection
-;; Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: XML
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Code:
(defvar nxml-file-name-ignore-case
- (memq system-type '(vax-vms windows-nt)))
+ (memq system-type '(windows-nt)))
(defvar nxml-cached-file-name-auto-coding-regexp nil)
(defvar nxml-cached-auto-mode-alist nil)
(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
;;; nxml-enc.el ends here