1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-04 20:27:45 +00:00

Followup to last change

* etc/NEWS: Mark nxml-sexp-element-flag entry as not needing
documentation updates.

* lisp/nxml/nxml-mode.el (nxml-mode, nxml-forward-balanced-item):
Doc fixes.
This commit is contained in:
Eli Zaretskii 2018-04-01 12:45:37 +03:00
parent 02e4b05c9d
commit f759c5cfe4
2 changed files with 18 additions and 17 deletions

View File

@ -289,7 +289,8 @@ by default use the last buffer that navigated to the current buffer.
** nxml-mode
*** Changed default for variable 'nxml-sexp-element-flag' to true.
---
*** The default value of 'nxml-sexp-element-flag' is now t.
This means that pressing C-M-SPACE now selects the entire tree by
default, and not just the opening element.

View File

@ -471,11 +471,10 @@ The Emacs commands that normally operate on balanced expressions will
operate on XML markup items. Thus \\[forward-sexp] will move forward
across one markup item; \\[backward-sexp] will move backward across
one markup item; \\[kill-sexp] will kill the following markup item;
\\[mark-sexp] will mark the following markup item. By default, each
tag each treated as a single markup item; to make the complete element
be treated as a single markup item, set the variable
`nxml-sexp-element-flag' to t. For more details, see the function
`nxml-forward-balanced-item'.
\\[mark-sexp] will mark the following markup item. By default, the
complete element is treated as a single markup item; to make each tag be
treated as a separate markup item, set the variable `nxml-sexp-element-flag'
to nil. For more details, see the function `nxml-forward-balanced-item'.
\\[nxml-backward-up-element] and \\[nxml-down-element] move up and down the element structure.
@ -1510,17 +1509,18 @@ With ARG, do it that many times. Negative arg -N means
move backward across N balanced expressions.
This is the equivalent of `forward-sexp' for XML.
An element contains as items strings with no markup, tags, processing
instructions, comments, CDATA sections, entity references and
characters references. However, if the variable
`nxml-sexp-element-flag' is non-nil, then an element is treated as a
single markup item. A start-tag contains an element name followed by
one or more attributes. An end-tag contains just an element name.
An attribute value literals contains strings with no markup, entity
references and character references. A processing instruction
consists of a target and a content string. A comment or a CDATA
section contains a single string. An entity reference contains a
single name. A character reference contains a character number."
An element is by default treated as a single markup item.
However, if the variable `nxml-sexp-element-flag' is nil, then an
element contains as items strings with no markup, tags,
processing instructions, comments, CDATA sections, entity
references and character references. A start-tag contains an
element name followed by one or more attributes. An end-tag
contains just an element name. An attribute value literals
contains strings with no markup, entity references and character
references. A processing instruction consists of a target and a
content string. A comment or a CDATA section contains a single
string. An entity reference contains a single name. A character
reference contains a character number."
(interactive "^p")
(or arg (setq arg 1))
(cond ((> arg 0)