diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/xml.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/xml.el')
| -rw-r--r-- | lisp/xml.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/xml.el b/lisp/xml.el index f5a9a3f8f0b..7a853d98cc6 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -126,9 +126,9 @@ tag. For example, would be represented by - '(\"\" . \"foo\"). + (\"\" . \"foo\"). -If you'd just like a plain symbol instead, use 'symbol-qnames in +If you'd just like a plain symbol instead, use `symbol-qnames' in the PARSE-NS argument." (car node)) @@ -1010,12 +1010,12 @@ The first line is indented with the optional INDENT-STRING." (defun xml-escape-string (string) "Convert STRING into a string containing valid XML character data. -Replace occurrences of &<>'\" in STRING with their default XML -entity references (e.g. replace each & with &). +Replace occurrences of &<>\\='\" in STRING with their default XML +entity references (e.g., replace each & with &). XML character data must not contain & or < characters, nor the > character under some circumstances. The XML spec does not impose -restriction on \" or ', but we just substitute for these too +restriction on \" or \\=', but we just substitute for these too \(as is permitted by the spec)." (with-temp-buffer (insert string) |