aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorChong Yidong2010-12-21 15:54:27 +0800
committerChong Yidong2010-12-21 15:54:27 +0800
commitb103c904d93826159ff0b8b397c8c0050190f56b (patch)
tree368ddbfac375d7cc2886151da006b0eb88a01273 /doc
parente14ad691966cd844eed62d4cb3793d0ecb07e45b (diff)
downloademacs-b103c904d93826159ff0b8b397c8c0050190f56b.tar.gz
emacs-b103c904d93826159ff0b8b397c8c0050190f56b.zip
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 @@
12010-12-21 Chong Yidong <cyd@stupidchicken.com>
2
3 * killing.texi: Resection the Info version to conform to the
4 printed manual, to avoid making sections on Accumulating Text, CUA
5 and Rectangles into full chapters.
6
12010-12-13 Eli Zaretskii <eliz@gnu.org> 72010-12-13 Eli Zaretskii <eliz@gnu.org>
2 8
3 * custom.texi (Init Syntax): Add index entries for "character syntax". 9 * 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 @@
4@c Free Software Foundation, Inc. 4@c Free Software Foundation, Inc.
5@c See file emacs.texi for copying conditions. 5@c See file emacs.texi for copying conditions.
6 6
7@node Killing, Yanking, Mark, Top 7@node Killing, Registers, Mark, Top
8@chapter Killing and Moving Text 8@chapter Killing and Moving Text
9 9
10@ifnottex
11@raisesections
12@end ifnottex
13
14 @dfn{Killing} means erasing text and copying it into the @dfn{kill 10 @dfn{Killing} means erasing text and copying it into the @dfn{kill
15ring}, from which you can bring it back into the buffer by 11ring}, from which you can bring it back into the buffer by
16@dfn{yanking} it. (Some applications use the terms ``cutting'' and 12@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
19there are commands for killing many different types of syntactic 15there are commands for killing many different types of syntactic
20units. 16units.
21 17
22@iftex 18@menu
19* Deletion and Killing:: Commands that remove text.
20* Yanking:: Commands that insert text.
21* Accumulating Text:: Other methods to add text to the buffer.
22* Rectangles:: Operating on text in rectangular areas.
23* CUA Bindings:: Using C-x/C-c/C-v to kill and yank.
24@end menu
25
26@node Deletion and Killing
23@section Deletion and Killing 27@section Deletion and Killing
24@end iftex
25 28
26@cindex killing text 29@cindex killing text
27@cindex cutting text 30@cindex cutting text
@@ -233,7 +236,7 @@ explain why the text has not been erased.
233non-@code{nil} value, identical subsequent kills yield a single 236non-@code{nil} value, identical subsequent kills yield a single
234kill-ring entry, without duplication. 237kill-ring entry, without duplication.
235 238
236@node Yanking, Accumulating Text, Killing, Top 239@node Yanking
237@section Yanking 240@section Yanking
238@cindex moving text 241@cindex moving text
239@cindex copying text 242@cindex copying text
@@ -416,7 +419,7 @@ saved.
416@code{kill-ring}; you can view the entire contents of the kill ring with 419@code{kill-ring}; you can view the entire contents of the kill ring with
417the command @kbd{C-h v kill-ring}. 420the command @kbd{C-h v kill-ring}.
418 421
419@node Accumulating Text, Rectangles, Yanking, Top 422@node Accumulating Text
420@section Accumulating Text 423@section Accumulating Text
421@findex append-to-buffer 424@findex append-to-buffer
422@findex prepend-to-buffer 425@findex prepend-to-buffer
@@ -487,7 +490,7 @@ can lead to losing some of your editing.
487 Another way to move text around is to store it in a register. 490 Another way to move text around is to store it in a register.
488@xref{Registers}. 491@xref{Registers}.
489 492
490@node Rectangles, CUA Bindings, Accumulating Text, Top 493@node Rectangles
491@section Rectangles 494@section Rectangles
492@cindex rectangle 495@cindex rectangle
493@cindex columns (and rectangles) 496@cindex columns (and rectangles)
@@ -613,7 +616,7 @@ rectangle shifts right.
613@code{string-rectangle}, but inserts the string on each line, 616@code{string-rectangle}, but inserts the string on each line,
614shifting the original text to the right. 617shifting the original text to the right.
615 618
616@node CUA Bindings, Registers, Rectangles, Top 619@node CUA Bindings
617@section CUA Bindings 620@section CUA Bindings
618@findex cua-mode 621@findex cua-mode
619@vindex cua-mode 622@vindex cua-mode
@@ -665,10 +668,6 @@ navigate to each of the words you want in the list, mark it (e.g. with
665insert a newline after the word in the target list by pressing 668insert a newline after the word in the target list by pressing
666@key{RET}. 669@key{RET}.
667 670
668@ifnottex
669@lowersections
670@end ifnottex
671
672@ignore 671@ignore
673 arch-tag: d8da8f96-0928-449a-816e-ff2d3497866c 672 arch-tag: d8da8f96-0928-449a-816e-ff2d3497866c
674@end ignore 673@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 @@
2@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
3@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
4@c See file emacs.texi for copying conditions. 4@c See file emacs.texi for copying conditions.
5@node Registers, Display, CUA Bindings, Top 5@node Registers, Display, Killing, Top
6@chapter Registers 6@chapter Registers
7@cindex registers 7@cindex registers
8 8