procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better support utf-8-with-signature and utf-8-hfs in XML/HTML

Browse source 
* lisp/international/mule.el (sgml-xml-auto-coding-function):
Support UTF-8 with BOM and utf-8-hfs as variants of UTF-8, and
obey the buffer's encoding if it is one of these variants, instead
of re-encoding in UTF-8 proper.  (Bug#20623)
This commit is contained in:
Eli Zaretskii 2017-12-15 11:06:07 +02:00
parent a2697fac0e
commit 889f07c352
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/international/mule.el
View file

@ -2493,7 +2493,17 @@ This function is intended to be added to `auto-coding-functions'."
(let* ((match (match-string 1)) (let* ((match (match-string 1))
(sym (intern (downcase match)))) (sym (intern (downcase match))))
(if (coding-system-p sym) (if (coding-system-p sym)
sym ;; If the encoding tag is UTF-8 and the buffer's
;; encoding is one of the variants of UTF-8, use the
;; buffer's encoding. This allows, e.g., saving an
;; XML file as UTF-8 with BOM when the tag says UTF-8.
(let ((sym-type (coding-system-type sym))
(bfcs-type
(coding-system-type buffer-file-coding-system)))
(if (and (coding-system-equal 'utf-8 sym-type)
(coding-system-equal 'utf-8 bfcs-type))
buffer-file-coding-system
sym))
(message "Warning: unknown coding system \"%s\"" match) (message "Warning: unknown coding system \"%s\"" match)
nil)) nil))
;; Files without an encoding tag should be UTF-8. But users ;; Files without an encoding tag should be UTF-8. But users
@ -2506,7 +2516,8 @@ This function is intended to be added to `auto-coding-functions'."
(coding-system-base (coding-system-base
(detect-coding-region (point-min) size t))))) (detect-coding-region (point-min) size t)))))
;; Pure ASCII always comes back as undecided. ;; Pure ASCII always comes back as undecided.
(if (memq detected '(utf-8 undecided)) (if (memq detected
'(utf-8 'utf-8-with-signature 'utf-8-hfs undecided))
'utf-8 'utf-8
(warn "File contents detected as %s. (warn "File contents detected as %s.
Consider adding an encoding attribute to the xml declaration, Consider adding an encoding attribute to the xml declaration,