diff options
| author | Eli Zaretskii | 2005-05-07 15:55:59 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2005-05-07 15:55:59 +0000 |
| commit | c2c51a11cdfb8a6e8e3a916e27b38d846c76dbdc (patch) | |
| tree | a9d6fcb98964bf9a2f322d03eae98dc02548c568 | |
| parent | a5ad278d7512fe43201d214cbc2a534d93d5dc82 (diff) | |
| download | emacs-c2c51a11cdfb8a6e8e3a916e27b38d846c76dbdc.tar.gz emacs-c2c51a11cdfb8a6e8e3a916e27b38d846c76dbdc.zip | |
(sgml-xml-auto-coding-function): Recognize encoding='FOO'
in single quotes as well as in double quotes.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/international/mule.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fcf570a3413..23941081c27 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-05-07 Jirka Kosek <jirka@kosek.cz> (tiny change) | ||
| 2 | |||
| 3 | * international/mule.el (sgml-xml-auto-coding-function): Recognize | ||
| 4 | encoding='FOO' in single quotes as well as in double quotes. | ||
| 5 | |||
| 1 | 2005-05-07 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> | 6 | 2005-05-07 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> |
| 2 | 7 | ||
| 3 | * emacs-lisp/cl-macs.el (cl-transform-lambda): Recognize `declare' | 8 | * emacs-lisp/cl-macs.el (cl-transform-lambda): Recognize `declare' |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 2b4117c7605..4b5a56a55b6 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -2180,9 +2180,9 @@ This function is intended to be added to `auto-coding-functions'." | |||
| 2180 | (when (re-search-forward "\\`[[:space:]\n]*<\\?xml" size t) | 2180 | (when (re-search-forward "\\`[[:space:]\n]*<\\?xml" size t) |
| 2181 | (let ((end (save-excursion | 2181 | (let ((end (save-excursion |
| 2182 | ;; This is a hack. | 2182 | ;; This is a hack. |
| 2183 | (re-search-forward "\"\\s-*\\?>" size t)))) | 2183 | (re-search-forward "[\"']\\s-*\\?>" size t)))) |
| 2184 | (when end | 2184 | (when end |
| 2185 | (if (re-search-forward "encoding=\"\\(.+?\\)\"" end t) | 2185 | (if (re-search-forward "encoding=[\"']\\(.+?\\)[\"']" end t) |
| 2186 | (let* ((match (match-string 1)) | 2186 | (let* ((match (match-string 1)) |
| 2187 | (sym (intern (downcase match)))) | 2187 | (sym (intern (downcase match)))) |
| 2188 | (if (coding-system-p sym) | 2188 | (if (coding-system-p sym) |