From 21100e7d3fe488d90e747caebbe4f7ccb90d2515 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 15 Oct 2011 12:37:45 -0400 Subject: [PATCH] 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. --- admin/FOR-RELEASE | 12 ++++++------ doc/emacs/ChangeLog | 10 ++++++++++ doc/emacs/killing.texi | 6 ++++-- doc/emacs/regs.texi | 35 +++++++++++++++++------------------ etc/NEWS | 2 ++ 5 files changed, 39 insertions(+), 26 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 4481d8cd93..26e3de6380 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -152,7 +152,7 @@ abbrevs.texi ack.texi anti.texi arevert-xtra.texi -basic.texi +basic.texi cyd buffers.texi building.texi calendar.texi @@ -172,23 +172,23 @@ fixit.texi fortran-xtra.texi frames.texi glossary.texi -help.texi +help.texi cyd indent.texi -killing.texi +killing.texi cyd kmacro.texi macos.texi maintaining.texi major.texi -mark.texi +mark.texi cyd mini.texi misc.texi msdog.texi msdog-xtra.texi mule.texi -m-x.texi +m-x.texi cyd picture-xtra.texi programs.texi -regs.texi +regs.texi cyd rmail.texi screen.texi cyd search.texi diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 3fa8eece14..a39b703b4d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,13 @@ +2011-10-15 Chong Yidong + + * display.texi (Scrolling): Tweak explanation of scroll direction. + (View Mode): Add index entries. + + * killing.texi (Deletion): Document negative prefix arg to M-SPC. + + * regs.texi (Text Registers): C-x r i does not activate the mark. + (Bookmarks): Document new default bookmark location. + 2011-10-13 Chong Yidong * killing.texi (Deletion): Add xref to Using Region. Document diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 493316daa5..8689e9c832 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -118,10 +118,12 @@ characters: spaces, tabs and newlines. @kbd{M-\} (@code{delete-horizontal-space}) deletes all the spaces and tab characters before and after point. With a prefix argument, this only deletes spaces and tab characters before point. @kbd{M-@key{SPC}} -(@code{just-one-space}) does likewise but leaves a single space after +(@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 after point. +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 a single space before point. @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/regs.texi b/doc/emacs/regs.texi index b4b9fd252e..41a807375a 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -30,9 +30,9 @@ Display a description of what register @var{r} contains. @end table @dfn{Bookmarks} record files and positions in them, so you can -return to those positions when you look at the file again. -Bookmarks are similar enough in spirit to registers that they -seem to belong in this chapter. +return to those positions when you look at the file again. Bookmarks +are similar in spirit to registers, so they are also documented in +this chapter. @menu * Position Registers:: Saving positions in registers. @@ -119,9 +119,9 @@ the region text to the text in the register instead of @kindex C-x r i @findex insert-register @kbd{C-x r i @var{r}} inserts in the buffer the text from register -@var{r}. Normally it leaves point before the text and places the mark -after, but with a numeric argument (@kbd{C-u}) it puts point after the -text and the mark before. +@var{r}. Normally it leaves point before the text and sets the mark +after, without activating it. With a numeric argument, it instead +puts point after the text and the mark before. @node Rectangle Registers @section Saving Rectangles in Registers @@ -143,12 +143,9 @@ Insert the rectangle stored in register @var{r} (if it contains a rectangle) (@code{insert-register}). @end table - The @kbd{C-x r i @var{r}} command inserts a text string if the -register contains one, and inserts a rectangle if the register contains -one. - - See also the command @code{sort-columns}, which you can think of -as sorting a rectangle. @xref{Sorting}. + The @kbd{C-x r i @var{r}} (@code{insert-register}) command, +previously documented in @ref{Text Registers}, inserts a rectangle +rather than a a text string, if the register contains a rectangle. @node Configuration Registers @section Saving Window Configurations in Registers @@ -281,12 +278,14 @@ you can use it to edit your bookmark definitions or annotate the bookmarks. Type @kbd{C-h m} in the bookmark buffer for more information about its special editing commands. - When you kill Emacs, Emacs offers to save your bookmark values in your -default bookmark file, @file{~/.emacs.bmk}, if you have changed any -bookmark values. You can also save the bookmarks at any time with the -@kbd{M-x bookmark-save} command. The bookmark commands load your -default bookmark file automatically. This saving and loading is how -bookmarks persist from one Emacs session to the next. + When you kill Emacs, Emacs offers to save your bookmark values, if +you have changed any bookmark values. You can also save the bookmarks +at any time with the @kbd{M-x bookmark-save} command. Bookmarks are +saved to the file @file{~/.emacs.d/bookmarks} (for compatibility with +older versions of Emacs, if you have a file named @file{~/.emacs.bmk}, +that is used instead). The bookmark commands load your default +bookmark file automatically. This saving and loading is how bookmarks +persist from one Emacs session to the next. @vindex bookmark-save-flag If you set the variable @code{bookmark-save-flag} to 1, each command diff --git a/etc/NEWS b/etc/NEWS index 386462fe92..d8d0741f92 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -251,6 +251,7 @@ highlight strings that indicate failure, caution or successful operation. with Xft. To change font, use the X resource font, for example: Emacs.pane.menubar.font: Courier-12 ++++ ** On graphical displays, the mode-line no longer ends in dashes. Also, the first dash (which does not indicate anything) is just displayed as a space. @@ -455,6 +456,7 @@ bound to M-=, which shows the number of lines, words, and characters. ** The default value of `backup-by-copying-when-mismatch' is now t. ++++ ** The command `just-one-space' (M-SPC), if given a negative argument, also deletes newlines around point. -- 2.20.1