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

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/02/18 02:04:38

Index: nxml-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/nxml-mode.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- nxml-mode.el        16 Jan 2008 16:17:52 -0000      1.9
+++ nxml-mode.el        18 Feb 2008 02:04:38 -0000      1.10
@@ -550,7 +550,11 @@
   (when nxml-syntax-highlight-flag
     (add-hook 'fontification-functions 'nxml-fontify nil t))
   (add-hook 'after-change-functions 'nxml-after-change nil t)
-  (add-hook 'write-contents-hooks 'nxml-prepare-to-save)
+  ;; Emacs 23 handles the encoding attribute on the xml declaration
+  ;; transparently to nxml-mode, so there is no longer a need for the below
+  ;; hook. The hook also had the drawback of overriding explicit user
+  ;; instruction to save as some encoding other than utf-8.
+;;;   (add-hook 'write-contents-hooks 'nxml-prepare-to-save)
   (when (not (and (buffer-file-name) (file-exists-p (buffer-file-name))))
     (when (and nxml-default-buffer-file-coding-system
               (not (local-variable-p 'buffer-file-coding-system)))