diff options
| author | Glenn Morris | 2014-01-29 00:27:55 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-01-29 00:27:55 -0800 |
| commit | 5e61c1ef5c0b827db4411b282034918159545c2f (patch) | |
| tree | 2a78fd0f3b296a1f4d618661caae009a2549d4c5 /doc | |
| parent | 61c2b0b3268dd5deb8958185fecdc5c947bfe485 (diff) | |
| download | emacs-5e61c1ef5c0b827db4411b282034918159545c2f.tar.gz emacs-5e61c1ef5c0b827db4411b282034918159545c2f.zip | |
Some doc for cycle-spacing
* lisp/simple.el (just-one-space, cycle-spacing): Doc fixes.
* doc/emacs/killing.texi (Deletion): Mention cycle-spacing.
* doc/lispref/text.texi: Comment.
* etc/NEWS: Related edits.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/killing.texi | 9 | ||||
| -rw-r--r-- | doc/lispref/text.texi | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 9cc901b87a2..8f29d7c01f6 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-01-29 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * killing.texi (Deletion): Mention cycle-spacing. | ||
| 4 | |||
| 1 | 2014-01-28 Glenn Morris <rgm@gnu.org> | 5 | 2014-01-28 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * text.texi (Fill Commands): Mention fill-single-char-nobreak-p. | 7 | * text.texi (Fill Commands): Mention fill-single-char-nobreak-p. |
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 1da226971eb..77dfad04bef 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi | |||
| @@ -109,12 +109,11 @@ number of characters. If the numeric argument is omitted or one, they | |||
| 109 | delete all the text in the region if it is active (@pxref{Using | 109 | delete all the text in the region if it is active (@pxref{Using |
| 110 | Region}). | 110 | Region}). |
| 111 | 111 | ||
| 112 | @c FIXME: `cycle-spacing' should be documented, too. (Maybe not in | ||
| 113 | @c this node, tho.) --xfq | ||
| 114 | @kindex M-\ | 112 | @kindex M-\ |
| 115 | @findex delete-horizontal-space | 113 | @findex delete-horizontal-space |
| 116 | @kindex M-SPC | 114 | @kindex M-SPC |
| 117 | @findex just-one-space | 115 | @findex just-one-space |
| 116 | @findex cycle-spacing | ||
| 118 | The other delete commands are those that delete only whitespace | 117 | The other delete commands are those that delete only whitespace |
| 119 | characters: spaces, tabs and newlines. @kbd{M-\} | 118 | characters: spaces, tabs and newlines. @kbd{M-\} |
| 120 | (@code{delete-horizontal-space}) deletes all the spaces and tab | 119 | (@code{delete-horizontal-space}) deletes all the spaces and tab |
| @@ -125,7 +124,11 @@ point, regardless of the number of spaces that existed previously | |||
| 125 | (even if there were none before). With a numeric argument @var{n}, it | 124 | (even if there were none before). With a numeric argument @var{n}, it |
| 126 | leaves @var{n} spaces before point if @var{n} is positive; if @var{n} | 125 | leaves @var{n} spaces before point if @var{n} is positive; if @var{n} |
| 127 | is negative, it deletes newlines in addition to spaces and tabs, | 126 | is negative, it deletes newlines in addition to spaces and tabs, |
| 128 | leaving @var{-n} spaces before point. | 127 | leaving @var{-n} spaces before point. The command @code{cycle-spacing} |
| 128 | acts like a more flexible version of @code{just-one-space}. It | ||
| 129 | does different things if you call it repeatedly in succession. | ||
| 130 | The first call acts like @code{just-one-space}, the next removes | ||
| 131 | all whitespace, and a third call restores the original whitespace. | ||
| 129 | 132 | ||
| 130 | @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines | 133 | @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines |
| 131 | after the current line. If the current line is blank, it deletes all | 134 | after the current line. If the current line is blank, it deletes all |
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index a6e98763d8f..786628bb32a 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -771,6 +771,9 @@ space, or @var{n} spaces if @var{n} is specified. It returns | |||
| 771 | @code{nil}. | 771 | @code{nil}. |
| 772 | @end deffn | 772 | @end deffn |
| 773 | 773 | ||
| 774 | @c There is also cycle-spacing, but I cannot see it being useful in | ||
| 775 | @c Lisp programs, so it is not mentioned here. | ||
| 776 | |||
| 774 | @deffn Command delete-blank-lines | 777 | @deffn Command delete-blank-lines |
| 775 | This function deletes blank lines surrounding point. If point is on a | 778 | This function deletes blank lines surrounding point. If point is on a |
| 776 | blank line with one or more blank lines before or after it, then all but | 779 | blank line with one or more blank lines before or after it, then all but |