diff options
author | Eli Zaretskii <eliz@gnu.org> | 2024-03-23 06:51:39 -0400 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2024-03-23 06:51:39 -0400 |
commit | e813c0fa3a17107b5b4857e186bc2512a3f8ae3c (patch) | |
tree | 2ae4f94c0516ea8e38e74cd2d6e5b030fa9c9dea /doc | |
parent | d7a6a6941bc8c0553b4dc5864ffdbfd677af90af (diff) | |
parent | 689f04a2ddfae856153bed762cc1461d66ec88de (diff) | |
download | emacs-e813c0fa3a17107b5b4857e186bc2512a3f8ae3c.tar.gz |
Merge from origin/emacs-29
689f04a2ddf Clarify description of format-spec truncation
759dedfab07 More accurate documentation of 'rmail-mail-new-frame'
fa79de7c6b8 ; * lisp/calendar/calendar.el: Remove extra space.
7f6e335f4b4 Fix documentation of M-SPC in user manual
5bdc2436c64 ; * lisp/emacs-lisp/cl-macs.el (cl-labels): Fix stray dif...
8014dbb2ad8 * admin/notes/bugtracker: Minor copyedit.
06a991e7e87 ; * admin/notes/bugtracker: Minor copyedit.
c890622e1a9 Tweak regexp for object initializers in csharp-mode (bug#...
f48babb1120 `term-mode': mention the keymap to add keybindings to
8cf05d9be12 Fix 'shortdoc-copy-function-as-kill'
d5901f3f05e Improve documentation of 'edebug-print-*' variables
Diffstat (limited to 'doc')
-rw-r--r-- | doc/emacs/killing.texi | 28 | ||||
-rw-r--r-- | doc/emacs/rmail.texi | 5 | ||||
-rw-r--r-- | doc/lispref/strings.texi | 2 |
3 files changed, 24 insertions, 11 deletions
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 9717c02f782..57adc037cb7 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -91,9 +91,11 @@ Delete the next character (@code{delete-char}). @item M-\ Delete spaces and tabs around point (@code{delete-horizontal-space}). +@item M-x just-one-space +Delete spaces and tabs around point, leaving one space. @item M-@key{SPC} -Delete spaces and tabs around point, leaving one space -(@code{just-one-space}). +Delete spaces and tabs around point in flexible ways +(@code{cycle-spacing}). @item C-x C-o Delete blank lines around the current line (@code{delete-blank-lines}). @item M-^ @@ -118,12 +120,13 @@ characters before and after point. With a prefix argument, this only deletes spaces and tab characters before point. @findex just-one-space -@code{just-one-space} does likewise but leaves a single space before -point, regardless of the number of spaces that existed previously -(even if there were none before). With a numeric argument @var{n}, it -leaves @var{n} spaces before point if @var{n} is positive; if @var{n} -is negative, it deletes newlines in addition to spaces and tabs, -leaving @minus{}@var{n} spaces before point. +@kbd{M-x just-one-space} deletes tabs and spaces around point, but +leaves a single space before point, regardless of the number of spaces +that existed previously (even if there were none before). With a +numeric argument @var{n}, it leaves @var{n} spaces before point if +@var{n} is positive; if @var{n} is negative, it deletes newlines in +addition to spaces and tabs, leaving @minus{}@var{n} spaces before +point. @kindex M-SPC @findex cycle-spacing @@ -131,7 +134,14 @@ leaving @minus{}@var{n} spaces before point. The command @code{cycle-spacing} (@kbd{M-@key{SPC}}) acts like a more flexible version of @code{just-one-space}. It performs different space cleanup actions defined by @code{cycle-spacing-actions}, in a -cyclic manner, if you call it repeatedly in succession. +cyclic manner, if you call it repeatedly in succession. By default, +the first invocation does the same as @code{just-one-space}, the +second deletes all whitespace characters around point like +@code{delete-horizontal-space}, and the third restores the original +whitespace characters; then it cycles. If invoked with a prefix +argument, each action is given that value of the argument. The user +option @code{cycle-spacing-actions} can include other members; see the +doc string of that option for the details. @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines after the current line. If the current line is blank, it deletes all diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index 51bd6086ce0..f94708b08ac 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -875,7 +875,10 @@ already composing, or to alter a message you have sent. If you set the variable @code{rmail-mail-new-frame} to a non-@code{nil} value, then all the Rmail commands to start sending a message create a new frame to edit it in. This frame is deleted when -you send the message. +you send the message (but not if it is the only visible frame on the +current display, or if it's a text-mode frame). If this frame cannot +be deleted when you send the message, Emacs will try to reuse it for +composing subsequent messages. @ignore @c FIXME does not work with Message -> Kill Message , or when you use the @samp{Cancel} item in the @samp{Mail} menu. diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 4fe94f78cba..a2285098aad 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -1369,7 +1369,7 @@ given width and precision, if specified. @item > This flag causes the substitution to be truncated on the right to the -given width, if specified. +given width and precision, if specified. @item ^ This flag converts the substituted text to upper case (@pxref{Case |