summaryrefslogtreecommitdiff
path: root/lisp/xml.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-11-17 15:28:50 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-11-17 15:29:35 -0800
commitac16149ba470ae8a625d42a61adbb6e84254c675 (patch)
tree9575cf0f1c5139a1943f9a18dd444ddc46983aa9 /lisp/xml.el
parentabf673af29ba2a2e0001ebd1db183377724f0cc4 (diff)
downloademacs-ac16149ba470ae8a625d42a61adbb6e84254c675.tar.gz
Fix docstring quoting problems with ‘ '’
Problem reported by Artur Malabarba in: http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html Most of these fixes are to documentation; many involve fixing longstanding quoting glitches that are independent of the recent substitute-command-keys changes. The changes to code are: * lisp/cedet/mode-local.el (mode-local-augment-function-help) (describe-mode-local-overload): Substitute docstrings before displaying them. * lisp/emacs-lisp/cl-macs.el (cl--transform-lambda): Quote the generated docstring for later substitution.
Diffstat (limited to 'lisp/xml.el')
-rw-r--r--lisp/xml.el10
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 &amp;).
+Replace occurrences of &<>\\='\" in STRING with their default XML
+entity references (e.g., replace each & with &amp;).
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)