summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-12-21 15:54:27 +0800
committerChong Yidong <cyd@stupidchicken.com>2010-12-21 15:54:27 +0800
commitb103c904d93826159ff0b8b397c8c0050190f56b (patch)
tree368ddbfac375d7cc2886151da006b0eb88a01273 /doc
parente14ad691966cd844eed62d4cb3793d0ecb07e45b (diff)
downloademacs-b103c904d93826159ff0b8b397c8c0050190f56b.tar.gz
Resection the Killing chapter in the Emacs manual.
* 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.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog6
-rw-r--r--doc/emacs/killing.texi29
-rw-r--r--doc/emacs/regs.texi2
3 files changed, 21 insertions, 16 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 062f6f4ad87..23a05240162 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -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".
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 150f05b5994..f43c2b4bc74 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -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 @@ moving or copying text within Emacs. It is very versatile, because
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 @@ explain why the text has not been erased.
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 @@ saved.
@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 @@ can lead to losing some of your editing.
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 @@ rectangle shifts right.
@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 @@ navigate to each of the words you want in the list, mark it (e.g. with
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
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index 0303d3a829d..d50bb087462 100644
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -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