Commit e1a3f5b1 authored by Chong Yidong's avatar Chong Yidong
Browse files

Updates to Mark chapter in Emacs manual.

* mark.texi (Mark): Clarify description of disabled Transient Mark
mode.
(Setting Mark): Document prefix arg for C-x C-x.  Document primary
selection changes.  Mention that commands like C-y set the mark.
(Marking Objects): Add xref to Words node.  Note that mark-word
and mark-sexp also have the "extend region" behavior.
(Using Region): Mention M-$ in the table.  Document
mark-even-if-inactive here instead of in Mark Ring.
(Mark Ring): Move mark-even-if-inactive to Using Region.  Take
note of the "Mark Set" behavior.
(Disabled Transient Mark): Rename from "Persistent Mark"
(Bug#9688).  Callers changed.

* programs.texi (Expressions):
* text.texi (Words): Defer to Marking Objects for mark-word doc.

Fixes: debbugs:9689
parent 79beb178
2011-10-12 Chong Yidong <cyd@stupidchicken.com>
* mark.texi (Mark): Clarify description of disabled Transient Mark
mode (Bug#9689).
(Setting Mark): Document prefix arg for C-x C-x. Document primary
selection changes. Mention that commands like C-y set the mark.
(Marking Objects): Add xref to Words node. Note that mark-word
and mark-sexp also have the "extend region" behavior.
(Using Region): Mention M-$ in the table. Document
mark-even-if-inactive here instead of in Mark Ring.
(Mark Ring): Move mark-even-if-inactive to Using Region. Take
note of the "Mark Set" behavior.
(Disabled Transient Mark): Rename from "Persistent Mark"
(Bug#9688). Callers changed.
* programs.texi (Expressions):
* text.texi (Words): Defer to Marking Objects for mark-word doc.
2011-10-09 Chong Yidong <cyd@stupidchicken.com>
* help.texi (Help, Help Summary): Eliminate the unnecessary "help
......
......@@ -306,7 +306,7 @@ The Mark and the Region
* Mark Ring:: Previous mark positions saved so you can go back there.
* Global Mark Ring:: Previous mark positions in various buffers.
* Shift Selection:: Using shifted cursor motion keys.
* Persistent Mark:: Keeping the mark active all the time.
* Disabled Transient Mark:: Leaving regions unhighlighted by default.
Killing and Moving Text
......
......@@ -98,11 +98,12 @@ was deliberate, redo the change as described above.
When there is an active region, any use of @code{undo} performs
@dfn{selective undo}: it undoes the most recent change within the
region, instead of the entire buffer. However, when Transient Mark
mode is off (@pxref{Persistent Mark}), @kbd{C-/} always operates on
the entire buffer, ignoring the region. In this case, you can perform
selective undo by supplying a prefix argument to the @code{undo}
command: @kbd{C-u C-/}. To undo further changes in the same region,
repeat the @code{undo} command (no prefix argument is needed).
mode is off (@pxref{Disabled Transient Mark}), @kbd{C-/} always
operates on the entire buffer, ignoring the region. In this case, you
can perform selective undo by supplying a prefix argument to the
@code{undo} command: @kbd{C-u C-/}. To undo further changes in the
same region, repeat the @code{undo} command (no prefix argument is
needed).
Some specialized buffers do not make undo records. Buffers whose
names start with spaces never do; these buffers are used internally by
......@@ -270,7 +271,7 @@ optionally correct it as well, type @kbd{M-$} (@code{ispell-word}).
If a region is active, @kbd{M-$} checks the spelling of all words
within the region. @xref{Mark}. (When Transient Mark mode is off,
@kbd{M-$} always acts on the word around or before point, ignoring the
region. @xref{Persistent Mark}.)
region; @pxref{Disabled Transient Mark}.)
@findex ispell
@findex ispell-buffer
......
This diff is collapsed.
......@@ -462,8 +462,9 @@ etc. To correct the overall indentation as well, type @key{TAB}
first.
@kbd{C-M-\} (@code{indent-region}) applies @key{TAB} to the region.
This is useful when Transient Mark mode is disabled (@pxref{Persistent
Mark}), because in that case @key{TAB} does not act on the region.
This is useful when Transient Mark mode is disabled (@pxref{Disabled
Transient Mark}), because in that case @key{TAB} does not act on the
region.
@kindex C-u TAB
If you like the relative indentation within a grouping but not the
......@@ -741,9 +742,12 @@ after point and the mark.
@kindex C-M-@@
@kindex C-M-@key{SPC}
@findex mark-sexp
To set the region around the next balanced expression in the buffer,
use @kbd{C-M-@key{SPC}} (@code{mark-sexp}), which sets mark at the
same place that @kbd{C-M-f} would move to. @kbd{C-M-@key{SPC}} treats
To operate on balanced expressions with an operation which acts on
the region, use the command @kbd{C-M-@key{SPC}} (@code{mark-sexp}).
This sets the mark at the same place that @kbd{C-M-f} would move to.
@xref{Marking Objects}, for more information about this command.
@kbd{C-M-@key{SPC}} treats
numeric arguments in the same way as @kbd{C-M-f}; in particular, a
negative argument puts the mark at the beginning of the previous
balanced expression. The alias @kbd{C-M-@@} is equivalent to
......
......@@ -147,13 +147,10 @@ more on transposition.
@kindex M-@@
@findex mark-word
To operate on the next @var{n} words with an operation which acts on
the region, use the command @kbd{M-@@} (@code{mark-word}). This
command does not move point, but sets the mark where @kbd{M-f} would
move to. Once the mark is active, each additional @kbd{M-@@} advances
the mark by one additional word. @kbd{M-@@} also accepts a numeric
argument that says how many words to scan for the place to put the
mark.
To operate on words with an operation which acts on the region, use
the command @kbd{M-@@} (@code{mark-word}). This command sets the mark
where @kbd{M-f} would move to. @xref{Marking Objects}, for more
information about this command.
The word commands' understanding of word boundaries is controlled by
the syntax table. Any character can, for example, be declared to be a
......@@ -2108,9 +2105,9 @@ the current Emacs session.
If the region is active, the command applies to the text in the
region; otherwise, it applies to any immediately following
self-inserting input. When Transient Mark mode is off
(@pxref{Persistent Mark}), it always applies to the region unless a
prefix argument is given, in which case it applies to the following
input.
(@pxref{Disabled Transient Mark}), it always applies to the region
unless a prefix argument is given, in which case it applies to the
following input.
Each of the two color submenus contains one additional item:
@samp{Other}. You can use this item to specify a color that is not
......
......@@ -53,10 +53,10 @@ a kill command that is taking a long time, either your text will
@emph{all} still be in the buffer, or it will @emph{all} be in the
kill ring, or maybe both. If the region is active, @kbd{C-g}
deactivates the mark, unless Transient Mark mode is off
(@pxref{Persistent Mark}). If you are in the middle of an incremental
search, @kbd{C-g} does special things; it may take two successive
@kbd{C-g} characters to get out of a search. @xref{Incremental
Search}, for details.
(@pxref{Disabled Transient Mark}). If you are in the middle of an
incremental search, @kbd{C-g} does special things; it may take two
successive @kbd{C-g} characters to get out of a search.
@xref{Incremental Search}, for details.
On MS-DOS, the character @kbd{C-@key{BREAK}} serves as a quit character
like @kbd{C-g}. The reason is that it is not feasible, on MS-DOS, to
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment