[Emacs-diffs] /srv/bzr/emacs/trunk r106090: Two minor manual updates.

[Chong Yidong]

------------------------------------------------------------
revno: 106090
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-10-15 12:37:45 -0400
message:
  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.
modified:
  admin/FOR-RELEASE
  doc/emacs/ChangeLog
  doc/emacs/killing.texi
  doc/emacs/regs.texi
  etc/NEWS

=== modified file 'admin/FOR-RELEASE'
--- a/admin/FOR-RELEASE 2011-10-07 16:22:04 +0000
+++ b/admin/FOR-RELEASE 2011-10-15 16:37:45 +0000
@@ -152,7 +152,7 @@
 ack.texi          
 anti.texi
 arevert-xtra.texi
-basic.texi        
+basic.texi        cyd
 buffers.texi      
 building.texi     
 calendar.texi     
@@ -172,23 +172,23 @@
 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       

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-10-13 16:03:49 +0000
+++ b/doc/emacs/ChangeLog       2011-10-15 16:37:45 +0000
@@ -1,3 +1,13 @@
+2011-10-15  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * killing.texi (Deletion): Add xref to Using Region.  Document

=== modified file 'doc/emacs/killing.texi'
--- a/doc/emacs/killing.texi    2011-10-13 16:03:49 +0000
+++ b/doc/emacs/killing.texi    2011-10-15 16:37:45 +0000
@@ -118,10 +118,12 @@
 (@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.  @address@hidden
-(@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

=== modified file 'doc/emacs/regs.texi'
--- a/doc/emacs/regs.texi       2011-07-11 15:41:41 +0000
+++ b/doc/emacs/regs.texi       2011-10-15 16:37:45 +0000
@@ -30,9 +30,9 @@
 @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 @@
 @kindex C-x r i
 @findex insert-register
   @kbd{C-x r i @var{r}} inserts in the buffer the text from register
address@hidden  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.
address@hidden  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 @@
 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 @@
 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
address@hidden 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

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2011-10-13 16:03:49 +0000
+++ b/etc/NEWS  2011-10-15 16:37:45 +0000
@@ -251,6 +251,7 @@
 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 @@
 
 ** 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.