aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-10-15 12:37:45 -0400
committerChong Yidong2011-10-15 12:37:45 -0400
commit21100e7d3fe488d90e747caebbe4f7ccb90d2515 (patch)
treee3b6f2deb86b198a2e8dd577d17229599a66ef02
parent6bbfa6e17d61b9725bf7240f86cbb802eee669f5 (diff)
downloademacs-21100e7d3fe488d90e747caebbe4f7ccb90d2515.tar.gz
emacs-21100e7d3fe488d90e747caebbe4f7ccb90d2515.zip
Two minor manual updates.
* doc/emacs/killing.texi (Deletion): Document negative prefix arg to M-SPC. * doc/emacs/regs.texi (Text Registers): C-x r i does not activate the mark. (Bookmarks): Document new default bookmark location.
-rw-r--r--admin/FOR-RELEASE12
-rw-r--r--doc/emacs/ChangeLog10
-rw-r--r--doc/emacs/killing.texi6
-rw-r--r--doc/emacs/regs.texi35
-rw-r--r--etc/NEWS2
5 files changed, 39 insertions, 26 deletions
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 4481d8cd93b..26e3de63808 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -152,7 +152,7 @@ abbrevs.texi
152ack.texi 152ack.texi
153anti.texi 153anti.texi
154arevert-xtra.texi 154arevert-xtra.texi
155basic.texi 155basic.texi cyd
156buffers.texi 156buffers.texi
157building.texi 157building.texi
158calendar.texi 158calendar.texi
@@ -172,23 +172,23 @@ fixit.texi
172fortran-xtra.texi 172fortran-xtra.texi
173frames.texi 173frames.texi
174glossary.texi 174glossary.texi
175help.texi 175help.texi cyd
176indent.texi 176indent.texi
177killing.texi 177killing.texi cyd
178kmacro.texi 178kmacro.texi
179macos.texi 179macos.texi
180maintaining.texi 180maintaining.texi
181major.texi 181major.texi
182mark.texi 182mark.texi cyd
183mini.texi 183mini.texi
184misc.texi 184misc.texi
185msdog.texi 185msdog.texi
186msdog-xtra.texi 186msdog-xtra.texi
187mule.texi 187mule.texi
188m-x.texi 188m-x.texi cyd
189picture-xtra.texi 189picture-xtra.texi
190programs.texi 190programs.texi
191regs.texi 191regs.texi cyd
192rmail.texi 192rmail.texi
193screen.texi cyd 193screen.texi cyd
194search.texi 194search.texi
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3fa8eece141..a39b703b4dd 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,13 @@
12011-10-15 Chong Yidong <cyd@stupidchicken.com>
2
3 * display.texi (Scrolling): Tweak explanation of scroll direction.
4 (View Mode): Add index entries.
5
6 * killing.texi (Deletion): Document negative prefix arg to M-SPC.
7
8 * regs.texi (Text Registers): C-x r i does not activate the mark.
9 (Bookmarks): Document new default bookmark location.
10
12011-10-13 Chong Yidong <cyd@stupidchicken.com> 112011-10-13 Chong Yidong <cyd@stupidchicken.com>
2 12
3 * killing.texi (Deletion): Add xref to Using Region. Document 13 * killing.texi (Deletion): Add xref to Using Region. Document
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 493316daa52..8689e9c8324 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -118,10 +118,12 @@ characters: spaces, tabs and newlines. @kbd{M-\}
118(@code{delete-horizontal-space}) deletes all the spaces and tab 118(@code{delete-horizontal-space}) deletes all the spaces and tab
119characters before and after point. With a prefix argument, this only 119characters before and after point. With a prefix argument, this only
120deletes spaces and tab characters before point. @kbd{M-@key{SPC}} 120deletes spaces and tab characters before point. @kbd{M-@key{SPC}}
121(@code{just-one-space}) does likewise but leaves a single space after 121(@code{just-one-space}) does likewise but leaves a single space before
122point, regardless of the number of spaces that existed previously 122point, regardless of the number of spaces that existed previously
123(even if there were none before). With a numeric argument @var{n}, it 123(even if there were none before). With a numeric argument @var{n}, it
124leaves @var{n} spaces after point. 124leaves @var{n} spaces before point if @var{n} is positive; if @var{n}
125is negative, it deletes newlines in addition to spaces and tabs,
126leaving a single space before point.
125 127
126 @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines 128 @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines
127after the current line. If the current line is blank, it deletes all 129after the current line. If the current line is blank, it deletes all
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index b4b9fd252e1..41a807375a9 100644
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -30,9 +30,9 @@ Display a description of what register @var{r} contains.
30@end table 30@end table
31 31
32 @dfn{Bookmarks} record files and positions in them, so you can 32 @dfn{Bookmarks} record files and positions in them, so you can
33return to those positions when you look at the file again. 33return to those positions when you look at the file again. Bookmarks
34Bookmarks are similar enough in spirit to registers that they 34are similar in spirit to registers, so they are also documented in
35seem to belong in this chapter. 35this chapter.
36 36
37@menu 37@menu
38* Position Registers:: Saving positions in registers. 38* Position Registers:: Saving positions in registers.
@@ -119,9 +119,9 @@ the region text to the text in the register instead of
119@kindex C-x r i 119@kindex C-x r i
120@findex insert-register 120@findex insert-register
121 @kbd{C-x r i @var{r}} inserts in the buffer the text from register 121 @kbd{C-x r i @var{r}} inserts in the buffer the text from register
122@var{r}. Normally it leaves point before the text and places the mark 122@var{r}. Normally it leaves point before the text and sets the mark
123after, but with a numeric argument (@kbd{C-u}) it puts point after the 123after, without activating it. With a numeric argument, it instead
124text and the mark before. 124puts point after the text and the mark before.
125 125
126@node Rectangle Registers 126@node Rectangle Registers
127@section Saving Rectangles in Registers 127@section Saving Rectangles in Registers
@@ -143,12 +143,9 @@ Insert the rectangle stored in register @var{r} (if it contains a
143rectangle) (@code{insert-register}). 143rectangle) (@code{insert-register}).
144@end table 144@end table
145 145
146 The @kbd{C-x r i @var{r}} command inserts a text string if the 146 The @kbd{C-x r i @var{r}} (@code{insert-register}) command,
147register contains one, and inserts a rectangle if the register contains 147previously documented in @ref{Text Registers}, inserts a rectangle
148one. 148rather than a a text string, if the register contains a rectangle.
149
150 See also the command @code{sort-columns}, which you can think of
151as sorting a rectangle. @xref{Sorting}.
152 149
153@node Configuration Registers 150@node Configuration Registers
154@section Saving Window Configurations in Registers 151@section Saving Window Configurations in Registers
@@ -281,12 +278,14 @@ you can use it to edit your bookmark definitions or annotate the
281bookmarks. Type @kbd{C-h m} in the bookmark buffer for more 278bookmarks. Type @kbd{C-h m} in the bookmark buffer for more
282information about its special editing commands. 279information about its special editing commands.
283 280
284 When you kill Emacs, Emacs offers to save your bookmark values in your 281 When you kill Emacs, Emacs offers to save your bookmark values, if
285default bookmark file, @file{~/.emacs.bmk}, if you have changed any 282you have changed any bookmark values. You can also save the bookmarks
286bookmark values. You can also save the bookmarks at any time with the 283at any time with the @kbd{M-x bookmark-save} command. Bookmarks are
287@kbd{M-x bookmark-save} command. The bookmark commands load your 284saved to the file @file{~/.emacs.d/bookmarks} (for compatibility with
288default bookmark file automatically. This saving and loading is how 285older versions of Emacs, if you have a file named @file{~/.emacs.bmk},
289bookmarks persist from one Emacs session to the next. 286that is used instead). The bookmark commands load your default
287bookmark file automatically. This saving and loading is how bookmarks
288persist from one Emacs session to the next.
290 289
291@vindex bookmark-save-flag 290@vindex bookmark-save-flag
292 If you set the variable @code{bookmark-save-flag} to 1, each command 291 If you set the variable @code{bookmark-save-flag} to 1, each command
diff --git a/etc/NEWS b/etc/NEWS
index 386462fe92e..d8d0741f928 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -251,6 +251,7 @@ highlight strings that indicate failure, caution or successful operation.
251with Xft. To change font, use the X resource font, for example: 251with Xft. To change font, use the X resource font, for example:
252Emacs.pane.menubar.font: Courier-12 252Emacs.pane.menubar.font: Courier-12
253 253
254+++
254** On graphical displays, the mode-line no longer ends in dashes. 255** On graphical displays, the mode-line no longer ends in dashes.
255Also, the first dash (which does not indicate anything) is just 256Also, the first dash (which does not indicate anything) is just
256displayed as a space. 257displayed as a space.
@@ -455,6 +456,7 @@ bound to M-=, which shows the number of lines, words, and characters.
455 456
456** The default value of `backup-by-copying-when-mismatch' is now t. 457** The default value of `backup-by-copying-when-mismatch' is now t.
457 458
459+++
458** The command `just-one-space' (M-SPC), if given a negative argument, 460** The command `just-one-space' (M-SPC), if given a negative argument,
459also deletes newlines around point. 461also deletes newlines around point.
460 462