Mercurial > emacs

--- a/doc/emacs/ChangeLog	Tue Dec 21 15:10:31 2010 +0800
+++ b/doc/emacs/ChangeLog	Tue Dec 21 15:54:27 2010 +0800
@@ -1,3 +1,9 @@
+2010-12-21  Chong Yidong  <cyd@stupidchicken.com>
+
+	* killing.texi: Resection the Info version to conform to the
+	printed manual, to avoid making sections on Accumulating Text, CUA
+	and Rectangles into full chapters.
+
 2010-12-13  Eli Zaretskii  <eliz@gnu.org>

 	* custom.texi (Init Syntax): Add index entries for "character syntax".
--- a/doc/emacs/killing.texi	Tue Dec 21 15:10:31 2010 +0800
+++ b/doc/emacs/killing.texi	Tue Dec 21 15:54:27 2010 +0800
@@ -4,13 +4,9 @@
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.

-@node Killing, Yanking, Mark, Top
+@node Killing, Registers, Mark, Top
 @chapter Killing and Moving Text

-@ifnottex
-@raisesections
-@end ifnottex
-
   @dfn{Killing} means erasing text and copying it into the @dfn{kill
 ring}, from which you can bring it back into the buffer by
 @dfn{yanking} it.  (Some applications use the terms ``cutting'' and
@@ -19,9 +15,16 @@
 there are commands for killing many different types of syntactic
 units.

-@iftex
+@menu
+* Deletion and Killing:: Commands that remove text.
+* Yanking::              Commands that insert text.
+* Accumulating Text::    Other methods to add text to the buffer.
+* Rectangles::           Operating on text in rectangular areas.
+* CUA Bindings::         Using C-x/C-c/C-v to kill and yank.
+@end menu
+
+@node Deletion and Killing
 @section Deletion and Killing
-@end iftex

 @cindex killing text
 @cindex cutting text
@@ -233,7 +236,7 @@
 non-@code{nil} value, identical subsequent kills yield a single
 kill-ring entry, without duplication.

-@node Yanking, Accumulating Text, Killing, Top
+@node Yanking
 @section Yanking
 @cindex moving text
 @cindex copying text
@@ -416,7 +419,7 @@
 @code{kill-ring}; you can view the entire contents of the kill ring with
 the command @kbd{C-h v kill-ring}.

-@node Accumulating Text, Rectangles, Yanking, Top
+@node Accumulating Text
 @section Accumulating Text
 @findex append-to-buffer
 @findex prepend-to-buffer
@@ -487,7 +490,7 @@
   Another way to move text around is to store it in a register.
 @xref{Registers}.

-@node Rectangles, CUA Bindings, Accumulating Text, Top
+@node Rectangles
 @section Rectangles
 @cindex rectangle
 @cindex columns (and rectangles)
@@ -613,7 +616,7 @@
 @code{string-rectangle}, but inserts the string on each line,
 shifting the original text to the right.

-@node CUA Bindings, Registers, Rectangles, Top
+@node CUA Bindings
 @section CUA Bindings
 @findex cua-mode
 @vindex cua-mode
@@ -665,10 +668,6 @@
 insert a newline after the word in the target list by pressing
 @key{RET}.

-@ifnottex
-@lowersections
-@end ifnottex
-
 @ignore
    arch-tag: d8da8f96-0928-449a-816e-ff2d3497866c
 @end ignore
--- a/doc/emacs/regs.texi	Tue Dec 21 15:10:31 2010 +0800
+++ b/doc/emacs/regs.texi	Tue Dec 21 15:54:27 2010 +0800
@@ -2,7 +2,7 @@
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
 @c   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
-@node Registers, Display, CUA Bindings, Top
+@node Registers, Display, Killing, Top
 @chapter Registers
 @cindex registers