diff options
| author | Paul Eggert | 2012-02-10 10:58:48 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-02-10 10:58:48 -0800 |
| commit | 6e6c82a4e687708d5a7a3887f92db45bd74da276 (patch) | |
| tree | 85dc3105240e84a8cddadb25d572e170fcdbd8bc /etc/tutorials/TUTORIAL | |
| parent | 78df1fb1d46d556bfc2698ca1802972b13613ba8 (diff) | |
| parent | cc26d239af9a82cff079556a1daff4b4bf60eb5c (diff) | |
| download | emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.tar.gz emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.zip | |
Merge from trunk.
Diffstat (limited to 'etc/tutorials/TUTORIAL')
| -rw-r--r-- | etc/tutorials/TUTORIAL | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index 12b22f83245..ccd438ad629 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL | |||
| @@ -379,7 +379,7 @@ Reinsertion of killed text is called "yanking". Generally, the | |||
| 379 | commands that can remove a lot of text kill the text (they are set up so | 379 | commands that can remove a lot of text kill the text (they are set up so |
| 380 | that you can yank the text), while the commands that remove just one | 380 | that you can yank the text), while the commands that remove just one |
| 381 | character, or only remove blank lines and spaces, do deletion (so you | 381 | character, or only remove blank lines and spaces, do deletion (so you |
| 382 | cannot yank that text). <DEL> and C-d do deletion in the simplest | 382 | cannot yank that text). <DEL> and C-d do deletion in the simplest |
| 383 | case, with no argument. When given an argument, they kill instead. | 383 | case, with no argument. When given an argument, they kill instead. |
| 384 | 384 | ||
| 385 | >> 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. |
| @@ -577,7 +577,6 @@ Most of the time, the buffer's name is the same as the file name | |||
| 577 | The buffer list you make with C-x C-b shows you both the buffer name | 577 | The buffer list you make with C-x C-b shows you both the buffer name |
| 578 | and the file name of every buffer. | 578 | and the file name of every buffer. |
| 579 | 579 | ||
| 580 | ANY text you see in an Emacs window is always part of some buffer. | ||
| 581 | Some buffers do not correspond to files. The buffer named | 580 | Some buffers do not correspond to files. The buffer named |
| 582 | "*Buffer List*", which contains the buffer list that you made with | 581 | "*Buffer List*", which contains the buffer list that you made with |
| 583 | C-x C-b, does not have any file. This TUTORIAL buffer initially did | 582 | C-x C-b, does not have any file. This TUTORIAL buffer initially did |