Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / lisp / nxml / nxml-enc.el

diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el
index ba75580..dffea03 100644 (file)
--- a/lisp/nxml/nxml-enc.el
+++ b/lisp/nxml/nxml-enc.el
@@ -1,24 +1,24 @@
 ;;; nxml-enc.el --- XML encoding auto-detection
 
-;; Copyright (C) 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML
 
-;; This program 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 2 of
-;; the License, or (at your option) any later version.
+;; This file is part of GNU Emacs.
 
-;; This program is distributed in the hope that it will be
-;; useful, but WITHOUT ANY WARRANTY; without even the implied
-;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;; PURPOSE.  See the GNU General Public License for more details.
+;; 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 of the License, or
+;; (at your option) any later version.
 
-;; You should have received a copy of the GNU General Public
-;; License along with this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -32,7 +32,7 @@
 ;;; 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)
@@ -72,6 +72,9 @@
   "Function to use as `set-auto-coding-function' when file is known to be XML."
   (nxml-detect-coding-system (+ (point) (min size 1024))))
 
+(declare-function xmltok-get-declared-encoding-position "xmltok"
+                  (&optional limit))    ; autoloaded
+
 (defun nxml-detect-coding-system (limit)
   (if (< limit (+ (point) 2))
       (if (eq (char-after) 0) 'no-conversion 'utf-8)
@@ -136,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)
 
 ;;; nxml-enc.el ends here