diff options
| author | Xue Fuqiao | 2013-08-02 22:06:27 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-08-02 22:06:27 +0800 |
| commit | 262a3aac2efabe8a59137c208f7d44f75b132daa (patch) | |
| tree | 28170e2a6015879925e7deb4f3d9febbcf7a93fa | |
| parent | 9097ad863d07035e9b01210490d6f09e9ee94c4e (diff) | |
| download | emacs-262a3aac2efabe8a59137c208f7d44f75b132daa.tar.gz emacs-262a3aac2efabe8a59137c208f7d44f75b132daa.zip | |
Add indexes for elisp manual.
* doc/lispref/display.texi (Face Functions): Add an index.
* doc/lispref/variables.texi (Variable Aliases): Add an index.
* doc/lispref/functions.texi (Defining Functions): Add an index.
* doc/lispref/nonascii.texi (Coding System Basics): Add an index.
| -rw-r--r-- | etc/ChangeLog | 2 | ||||
| -rw-r--r-- | etc/tutorials/TUTORIAL | 29 |
2 files changed, 17 insertions, 14 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 2e1bb5389e9..9e9bdfb9792 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2013-08-02 Xue Fuqiao <xfq.free@gmail.com> | 1 | 2013-08-02 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 2 | ||
| 3 | * tutorials/TUTORIAL: Remove a redundant sentence. | ||
| 4 | |||
| 3 | * tutorials/TUTORIAL.cn: Update; synchronize with TUTORIAL. | 5 | * tutorials/TUTORIAL.cn: Update; synchronize with TUTORIAL. |
| 4 | 6 | ||
| 5 | * tutorials/TUTORIAL.translators (Maintainer): Update the maintainer. | 7 | * tutorials/TUTORIAL.translators (Maintainer): Update the maintainer. |
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index 91962fd722c..91b3731fd0d 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL | |||
| @@ -372,13 +372,15 @@ the text between the two positions. | |||
| 372 | 372 | ||
| 373 | The difference between "killing" and "deleting" is that "killed" text | 373 | The difference between "killing" and "deleting" is that "killed" text |
| 374 | can be reinserted (at any position), whereas "deleted" things cannot | 374 | can be reinserted (at any position), whereas "deleted" things cannot |
| 375 | be reinserted in this way (you can, however, undo a deletion--see below). | 375 | be reinserted in this way (you can, however, undo a deletion--see |
| 376 | Reinsertion of killed text is called "yanking". Generally, the | 376 | below). Reinsertion of killed text is called "yanking". (Think of it |
| 377 | commands that can remove a lot of text kill the text (they are set up so | 377 | as yanking back, or pulling back, some text that was taken away.) |
| 378 | that you can yank the text), while the commands that remove just one | 378 | Generally, the commands that can remove a lot of text kill the text |
| 379 | character, or only remove blank lines and spaces, do deletion (so you | 379 | (they are set up so that you can yank the text), while the commands |
| 380 | cannot yank that text). <DEL> and C-d do deletion in the simplest | 380 | that remove just one character, or only remove blank lines and spaces, |
| 381 | case, with no argument. When given an argument, they kill instead. | 381 | do deletion (so you cannot yank that text). <DEL> and C-d do deletion |
| 382 | in the simplest case, with no argument. When given an argument, they | ||
| 383 | kill instead. | ||
| 382 | 384 | ||
| 383 | >> Move the cursor to the beginning of a line which is not empty. | 385 | >> Move the cursor to the beginning of a line which is not empty. |
| 384 | Then type C-k to kill the text on that line. | 386 | Then type C-k to kill the text on that line. |
| @@ -391,13 +393,12 @@ treats a numeric argument specially: it kills that many lines AND | |||
| 391 | their contents. This is not mere repetition. C-u 2 C-k kills two | 393 | their contents. This is not mere repetition. C-u 2 C-k kills two |
| 392 | lines and their newlines; typing C-k twice would not do that. | 394 | lines and their newlines; typing C-k twice would not do that. |
| 393 | 395 | ||
| 394 | Reinserting killed text is called "yanking". (Think of it as yanking | 396 | You can yank the killed text either at the same place where it was |
| 395 | back, or pulling back, some text that was taken away.) You can yank | 397 | killed, or at some other place in the text you are editing, or even in |
| 396 | the killed text either at the same place where it was killed, or at | 398 | a different file. You can yank the same text several times; that |
| 397 | some other place in the text you are editing, or even in a different | 399 | makes multiple copies of it. Some other editors call killing and |
| 398 | file. You can yank the same text several times; that makes multiple | 400 | yanking "cutting" and "pasting" (see the Glossary in the Emacs |
| 399 | copies of it. Some other editors call killing and yanking "cutting" | 401 | manual). |
| 400 | and "pasting" (see the Glossary in the Emacs manual). | ||
| 401 | 402 | ||
| 402 | The command for yanking is C-y. It reinserts the last killed text, | 403 | The command for yanking is C-y. It reinserts the last killed text, |
| 403 | at the current cursor position. | 404 | at the current cursor position. |