+  |
+ ||
 |
+ ||
 |
||
| + | (Click on any of these pictures for a larger view.) | |
To run the tutorial, start Emacs and type C-h t, that is, Ctrl-h followed by t.
-All the features described in this tour work in GNU Emacs 22. Some features +
All the features described in this tour work in GNU Emacs 23. Some features described weren't included in previous versions of Emacs but can be installed separately.
@@ -363,16 +370,6 @@ C-y (yank), inserting a file, and inserting a buffer all set the region to surround the inserted text. -Usually, the region is invisible. Emacs does not highlight it by default: - this would be annoying when you merely wanted to move point without caring - about the region. M-x transient-mark-mode makes Emacs highlight the - region, but only when you appear to be actively using it. C-SPC and - commands which set the region are said to activate the mark (that - is, they activate highlighting of the region), but modifying the buffer in - any way deactivates the mark. For more information - see - (info "(emacs)Transient Mark").
-Narrowing restricts the view (and editing) of a buffer to a certain region. This is handy when you're only working with a small part of a buffer (e.g. a chapter in a book). Then commands like incremental search, @@ -479,13 +476,6 @@ cursor (so as to break any existing sequence of undos), and press C-/ until you find what you want.
-You can also restrict undo to the current region to avoid affecting - subsequent actions elsewhere:
- -| C-u C-/ | Undo within region |
To learn more about undo, see (info "(emacs)Undo").
@@ -791,18 +781,18 @@Version control
Emacs helps you manipulate and edit files stored in version control. Emacs - supports CVS, Arch, RCS, Subversion and more, but it offers a uniform - interface, called VC, regardless of the version control system you are - using.
+ supports CVS, Subversion, bzr, git, hg, and other systems, but it offers a + uniform interface, called VC, regardless of the version control system you + are using.Emacs automatically detects when a file you're editing is under version control, and displays something like this in the mode line: CVS-1.14 to indicate the version control system in use, and the current version.
M-x vc-next-action or C-x v v commits the current file - (prompting you for a log message) if you've modified it, or locks the file - for you if you haven't acquired a lock. (The locking step is not necessary - under CVS and some other version control systems.)
+ (prompting you for a log message) if you've modified it. (Under version + control systems that require locking, this command also acquires a lock for + you.)VC provides other commands for version control-related tasks:
@@ -855,10 +845,10 @@Emacs server
-Some people like to keep only single instance of Emacs open and edit all - their files in there. Doing so has its advantages:
+Some people like to keep only a single instance of Emacs open and edit all + their files in there. Doing this has a few advantages:
-
-
- You can kill/yank text between buffers, but only in the same instance of +
- You can kill/yank text between buffers in the same instance of Emacs.
- Emacs remembers argument histories (what commands you've used, what files you've opened, terms you've searched for, etc.), but only within each @@ -866,21 +856,22 @@
- If you have many customizations, starting new instances of Emacs is slow.
Alas, when you type $ emacs in a shell to edit a file (or +
Alas, when you type emacs in a shell to edit a file (or when $EDITOR is invoked by an external program), a new instance of Emacs is started. You can avoid this by using emacsclient, which - connects to an existing instance of Emacs and tells it instead to open the - file for you:
+ instead opens a new frame connected to an existing instance of Emacs:- In your existing instance of Emacs, type M-x server-start. Or add (server-start) to your .emacs file to make it do that automatically at startup. -
- To edit a file, type $ emacsclient FILENAME at a prompt. The - file appears in one of your existing Emacs frames. You can also - change $EDITOR to emacsclient if you're using programs - that invoke $EDITOR to get input from you. -
- When you're done editing, type C-x #. Emacs will close the - buffer and you can return to whatever you were doing in the shell. +
- To edit a file, type emacsclient -t FILENAME at a + prompt. You can also change your $EDITOR + to emacsclient -t if you're using programs that automatically + invoke $EDITOR. (emacsclient -t opens a new frame on + the terminal; alternatively, emacsclient -c opens a new X + frame.) +
- When you're done editing, type C-x C-c, which closes the + frame.
For more information, @@ -911,8 +902,6 @@
We've also seen a prefix argument used to modify the following command (the numeric argument, if provided, is ignored):
| C-/ | Undo |
| C-u C-/ | Undo within current region |
| M-x shell | Create or switch to shell buffer named *shell* |
| C-u M-x shell | Create or switch to shell buffer with |