Move here from ../../man
[bpt/emacs.git] / doc / emacs / files.texi
1 @c This is part of the Emacs manual.
2 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
3 @c 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
4 @c See file emacs.texi for copying conditions.
5 @node Files, Buffers, Keyboard Macros, Top
6 @chapter File Handling
7 @cindex files
8
9 The operating system stores data permanently in named @dfn{files}, so
10 most of the text you edit with Emacs comes from a file and is ultimately
11 stored in a file.
12
13 To edit a file, you must tell Emacs to read the file and prepare a
14 buffer containing a copy of the file's text. This is called
15 @dfn{visiting} the file. Editing commands apply directly to text in the
16 buffer; that is, to the copy inside Emacs. Your changes appear in the
17 file itself only when you @dfn{save} the buffer back into the file.
18
19 In addition to visiting and saving files, Emacs can delete, copy,
20 rename, and append to files, keep multiple versions of them, and operate
21 on file directories.
22
23 @menu
24 * File Names:: How to type and edit file-name arguments.
25 * Visiting:: Visiting a file prepares Emacs to edit the file.
26 * Saving:: Saving makes your changes permanent.
27 * Reverting:: Reverting cancels all the changes not saved.
28 @ifnottex
29 * Autorevert:: Auto Reverting non-file buffers.
30 @end ifnottex
31 * Auto Save:: Auto Save periodically protects against loss of data.
32 * File Aliases:: Handling multiple names for one file.
33 * Version Control:: Version control systems (RCS, CVS and SCCS).
34 * Directories:: Creating, deleting, and listing file directories.
35 * Comparing Files:: Finding where two files differ.
36 * Diff Mode:: Mode for editing file differences.
37 * Misc File Ops:: Other things you can do on files.
38 * Compressed Files:: Accessing compressed files.
39 * File Archives:: Operating on tar, zip, jar etc. archive files.
40 * Remote Files:: Accessing files on other sites.
41 * Quoted File Names:: Quoting special characters in file names.
42 * File Name Cache:: Completion against a list of files you often use.
43 * File Conveniences:: Convenience Features for Finding Files.
44 * Filesets:: Handling sets of files.
45 @end menu
46
47 @node File Names
48 @section File Names
49 @cindex file names
50
51 Most Emacs commands that operate on a file require you to specify the
52 file name. (Saving and reverting are exceptions; the buffer knows which
53 file name to use for them.) You enter the file name using the
54 minibuffer (@pxref{Minibuffer}). @dfn{Completion} is available
55 (@pxref{Completion}) to make it easier to specify long file names. When
56 completing file names, Emacs ignores those whose file-name extensions
57 appear in the variable @code{completion-ignored-extensions}; see
58 @ref{Completion Options}.
59
60 For most operations, there is a @dfn{default file name} which is used
61 if you type just @key{RET} to enter an empty argument. Normally the
62 default file name is the name of the file visited in the current buffer;
63 this makes it easy to operate on that file with any of the Emacs file
64 commands.
65
66 @vindex default-directory
67 Each buffer has a default directory which is normally the same as the
68 directory of the file visited in that buffer. When you enter a file
69 name without a directory, the default directory is used. If you specify
70 a directory in a relative fashion, with a name that does not start with
71 a slash, it is interpreted with respect to the default directory. The
72 default directory is kept in the variable @code{default-directory},
73 which has a separate value in every buffer.
74
75 @findex cd
76 @findex pwd
77 The command @kbd{M-x pwd} displays the current buffer's default
78 directory, and the command @kbd{M-x cd} sets it (to a value read using
79 the minibuffer). A buffer's default directory changes only when the
80 @code{cd} command is used. A file-visiting buffer's default directory
81 is initialized to the directory of the file it visits. If you create
82 a buffer with @kbd{C-x b}, its default directory is copied from that
83 of the buffer that was current at the time.
84
85 For example, if the default file name is @file{/u/rms/gnu/gnu.tasks}
86 then the default directory is normally @file{/u/rms/gnu/}. If you
87 type just @samp{foo}, which does not specify a directory, it is short
88 for @file{/u/rms/gnu/foo}. @samp{../.login} would stand for
89 @file{/u/rms/.login}. @samp{new/foo} would stand for the file name
90 @file{/u/rms/gnu/new/foo}.
91
92 @vindex insert-default-directory
93 The default directory actually appears in the minibuffer when the
94 minibuffer becomes active to read a file name. This serves two
95 purposes: it @emph{shows} you what the default is, so that you can type
96 a relative file name and know with certainty what it will mean, and it
97 allows you to @emph{edit} the default to specify a different directory.
98 This insertion of the default directory is inhibited if the variable
99 @code{insert-default-directory} is set to @code{nil}.
100
101 Note that it is legitimate to type an absolute file name after you
102 enter the minibuffer, ignoring the presence of the default directory
103 name as part of the text. The final minibuffer contents may look
104 invalid, but that is not so. For example, if the minibuffer starts out
105 with @samp{/usr/tmp/} and you add @samp{/x1/rms/foo}, you get
106 @samp{/usr/tmp//x1/rms/foo}; but Emacs ignores everything through the
107 first slash in the double slash; the result is @samp{/x1/rms/foo}.
108 @xref{Minibuffer File}.
109
110 @cindex home directory shorthand
111 You can use @file{~/} in a file name to mean your home directory,
112 or @file{~@var{user-id}/} to mean the home directory of a user whose
113 login name is @code{user-id}@footnote{
114 On MS-Windows and MS-DOS systems, where a user doesn't have a home
115 directory, Emacs replaces @file{~/} with the value of the
116 environment variable @code{HOME}; see @ref{General Variables}. On
117 these systems, the @file{~@var{user-id}/} construct is supported only
118 for the current user, i.e., only if @var{user-id} is the current
119 user's login name.}.
120
121 @cindex environment variables in file names
122 @cindex expansion of environment variables
123 @cindex @code{$} in file names
124 @anchor{File Names with $}@samp{$} in a file name is used to
125 substitute an environment variable. The environment variable name
126 consists of all the alphanumeric characters after the @samp{$};
127 alternatively, it can be enclosed in braces after the @samp{$}. For
128 example, if you have used the shell command @command{export
129 FOO=rms/hacks} to set up an environment variable named @env{FOO}, then
130 you can use @file{/u/$FOO/test.c} or @file{/u/$@{FOO@}/test.c} as an
131 abbreviation for @file{/u/rms/hacks/test.c}. If the environment
132 variable is not defined, no substitution occurs: @file{/u/$notdefined}
133 stands for itself (assuming the environment variable @env{notdefined}
134 is not defined).
135
136 Note that shell commands to set environment variables affect Emacs
137 only when done before Emacs is started.
138
139 To access a file with @samp{$} in its name, if the @samp{$} causes
140 expansion, type @samp{$$}. This pair is converted to a single
141 @samp{$} at the same time as variable substitution is performed for a
142 single @samp{$}. Alternatively, quote the whole file name with
143 @samp{/:} (@pxref{Quoted File Names}). File names which begin with a
144 literal @samp{~} should also be quoted with @samp{/:}.
145
146 @findex substitute-in-file-name
147 The Lisp function that performs the @samp{$}-substitution is called
148 @code{substitute-in-file-name}. The substitution is performed only on
149 file names read as such using the minibuffer.
150
151 You can include non-@acronym{ASCII} characters in file names if you set the
152 variable @code{file-name-coding-system} to a non-@code{nil} value.
153 @xref{File Name Coding}.
154
155 @node Visiting
156 @section Visiting Files
157 @cindex visiting files
158 @cindex open file
159
160 @table @kbd
161 @item C-x C-f
162 Visit a file (@code{find-file}).
163 @item C-x C-r
164 Visit a file for viewing, without allowing changes to it
165 (@code{find-file-read-only}).
166 @item C-x C-v
167 Visit a different file instead of the one visited last
168 (@code{find-alternate-file}).
169 @item C-x 4 f
170 Visit a file, in another window (@code{find-file-other-window}). Don't
171 alter what is displayed in the selected window.
172 @item C-x 5 f
173 Visit a file, in a new frame (@code{find-file-other-frame}). Don't
174 alter what is displayed in the selected frame.
175 @item M-x find-file-literally
176 Visit a file with no conversion of the contents.
177 @end table
178
179 @cindex files, visiting and saving
180 @cindex saving files
181 @dfn{Visiting} a file means reading its contents into an Emacs
182 buffer so you can edit them. Emacs makes a new buffer for each file
183 that you visit. We often say that this buffer ``is visiting'' that
184 file, or that the buffer's ``visited file'' is that file. Emacs
185 constructs the buffer name from the file name by throwing away the
186 directory, keeping just the name proper. For example, a file named
187 @file{/usr/rms/emacs.tex} would get a buffer named @samp{emacs.tex}.
188 If there is already a buffer with that name, Emacs constructs a unique
189 name---the normal method is to append @samp{<2>}, @samp{<3>}, and so
190 on, but you can select other methods (@pxref{Uniquify}).
191
192 Each window's mode line shows the name of the buffer that is being displayed
193 in that window, so you can always tell what buffer you are editing.
194
195 The changes you make with editing commands are made in the Emacs
196 buffer. They do not take effect in the file that you visited, or any
197 permanent place, until you @dfn{save} the buffer. Saving the buffer
198 means that Emacs writes the current contents of the buffer into its
199 visited file. @xref{Saving}.
200
201 @cindex modified (buffer)
202 If a buffer contains changes that have not been saved, we say the
203 buffer is @dfn{modified}. This is important because it implies that
204 some changes will be lost if the buffer is not saved. The mode line
205 displays two stars near the left margin to indicate that the buffer is
206 modified.
207
208 @kindex C-x C-f
209 @findex find-file
210 To visit a file, use the command @kbd{C-x C-f} (@code{find-file}). Follow
211 the command with the name of the file you wish to visit, terminated by a
212 @key{RET}.
213
214 The file name is read using the minibuffer (@pxref{Minibuffer}), with
215 defaulting and completion in the standard manner (@pxref{File Names}).
216 While in the minibuffer, you can abort @kbd{C-x C-f} by typing
217 @kbd{C-g}. File-name completion ignores certain file names; for more
218 about this, see @ref{Completion Options}.
219
220 Your confirmation that @kbd{C-x C-f} has completed successfully is
221 the appearance of new text on the screen and a new buffer name in the
222 mode line. If the specified file does not exist and you could not
223 create it, or exists but you can't read it, then you get an error,
224 with an error message displayed in the echo area.
225
226 If you visit a file that is already in Emacs, @kbd{C-x C-f} does not make
227 another copy. It selects the existing buffer containing that file.
228 However, before doing so, it checks whether the file itself has changed
229 since you visited or saved it last. If the file has changed, Emacs offers
230 to reread it.
231
232 @vindex large-file-warning-threshold
233 @cindex maximum buffer size exceeded, error message
234 If you try to visit a file larger than
235 @code{large-file-warning-threshold} (the default is 10000000, which is
236 about 10 megabytes), Emacs will ask you for confirmation first. You
237 can answer @kbd{y} to proceed with visiting the file. Note, however,
238 that Emacs cannot visit files that are larger than the maximum Emacs
239 buffer size, which is around 256 megabytes on 32-bit machines
240 (@pxref{Buffers}). If you try, Emacs will display an error message
241 saying that the maximum buffer size has been exceeded.
242
243 @cindex file selection dialog
244 On graphical displays there are two additional methods for
245 visiting files. Firstly, when Emacs is built with a suitable GUI
246 toolkit, commands invoked with the mouse (by clicking on the menu bar
247 or tool bar) use the toolkit's standard File Selection dialog instead
248 of prompting for the file name in the minibuffer. On Unix and
249 GNU/Linux platforms, Emacs does that when built with GTK, LessTif, and
250 Motif toolkits; on MS-Windows and Mac, the GUI version does that by default.
251 For information on how to customize this, see @ref{Dialog Boxes}.
252
253 Secondly, Emacs supports ``drag and drop''; dropping a file into an
254 ordinary Emacs window visits the file using that window. However,
255 dropping a file into a window displaying a Dired buffer moves or
256 copies the file into the displayed directory. For details, see
257 @ref{Drag and Drop}, and @ref{Misc Dired Features}.
258
259 @cindex creating files
260 What if you want to create a new file? Just visit it. Emacs displays
261 @samp{(New file)} in the echo area, but in other respects behaves as if
262 you had visited an existing empty file. If you make any changes and
263 save them, the file is created.
264
265 Emacs recognizes from the contents of a file which end-of-line
266 convention it uses to separate lines---newline (used on GNU/Linux and
267 on Unix), carriage-return linefeed (used on Microsoft systems), or
268 just carriage-return (used on the Macintosh)---and automatically
269 converts the contents to the normal Emacs convention, which is that
270 the newline character separates lines. This is a part of the general
271 feature of coding system conversion (@pxref{Coding Systems}), and
272 makes it possible to edit files imported from different operating
273 systems with equal convenience. If you change the text and save the
274 file, Emacs performs the inverse conversion, changing newlines back
275 into carriage-return linefeed or just carriage-return if appropriate.
276
277 @vindex find-file-run-dired
278 If the file you specify is actually a directory, @kbd{C-x C-f} invokes
279 Dired, the Emacs directory browser, so that you can ``edit'' the contents
280 of the directory (@pxref{Dired}). Dired is a convenient way to view, delete,
281 or operate on the files in the directory. However, if the variable
282 @code{find-file-run-dired} is @code{nil}, then it is an error to try
283 to visit a directory.
284
285 Files which are actually collections of other files, or @dfn{file
286 archives}, are visited in special modes which invoke a Dired-like
287 environment to allow operations on archive members. @xref{File
288 Archives}, for more about these features.
289
290 @cindex wildcard characters in file names
291 @vindex find-file-wildcards
292 If the file name you specify contains shell-style wildcard
293 characters, Emacs visits all the files that match it. (On
294 case-insensitive filesystems, Emacs matches the wildcards disregarding
295 the letter case.) Wildcards include @samp{?}, @samp{*}, and
296 @samp{[@dots{}]} sequences. To enter the wild card @samp{?} in a file
297 name in the minibuffer, you need to type @kbd{C-q ?}. @xref{Quoted
298 File Names}, for information on how to visit a file whose name
299 actually contains wildcard characters. You can disable the wildcard
300 feature by customizing @code{find-file-wildcards}.
301
302 If you visit a file that the operating system won't let you modify,
303 or that is marked read-only, Emacs makes the buffer read-only too, so
304 that you won't go ahead and make changes that you'll have trouble
305 saving afterward. You can make the buffer writable with @kbd{C-x C-q}
306 (@code{toggle-read-only}). @xref{Misc Buffer}.
307
308 @kindex C-x C-r
309 @findex find-file-read-only
310 If you want to visit a file as read-only in order to protect
311 yourself from entering changes accidentally, visit it with the command
312 @kbd{C-x C-r} (@code{find-file-read-only}) instead of @kbd{C-x C-f}.
313
314 @kindex C-x C-v
315 @findex find-alternate-file
316 If you visit a nonexistent file unintentionally (because you typed the
317 wrong file name), use the @kbd{C-x C-v} command
318 (@code{find-alternate-file}) to visit the file you really wanted.
319 @kbd{C-x C-v} is similar to @kbd{C-x C-f}, but it kills the current
320 buffer (after first offering to save it if it is modified). When
321 @kbd{C-x C-v} reads the file name to visit, it inserts the entire
322 default file name in the buffer, with point just after the directory
323 part; this is convenient if you made a slight error in typing the name.
324
325 @kindex C-x 4 f
326 @findex find-file-other-window
327 @kbd{C-x 4 f} (@code{find-file-other-window}) is like @kbd{C-x C-f}
328 except that the buffer containing the specified file is selected in another
329 window. The window that was selected before @kbd{C-x 4 f} continues to
330 show the same buffer it was already showing. If this command is used when
331 only one window is being displayed, that window is split in two, with one
332 window showing the same buffer as before, and the other one showing the
333 newly requested file. @xref{Windows}.
334
335 @kindex C-x 5 f
336 @findex find-file-other-frame
337 @kbd{C-x 5 f} (@code{find-file-other-frame}) is similar, but opens a
338 new frame, or makes visible any existing frame showing the file you
339 seek. This feature is available only when you are using a window
340 system. @xref{Frames}.
341
342 @findex find-file-literally
343 If you wish to edit a file as a sequence of @acronym{ASCII} characters with no special
344 encoding or conversion, use the @kbd{M-x find-file-literally} command.
345 It visits a file, like @kbd{C-x C-f}, but does not do format conversion
346 (@pxref{Formatted Text}), character code conversion (@pxref{Coding
347 Systems}), or automatic uncompression (@pxref{Compressed Files}), and
348 does not add a final newline because of @code{require-final-newline}.
349 If you already have visited the same file in the usual (non-literal)
350 manner, this command asks you whether to visit it literally instead.
351
352 @vindex find-file-hook
353 @vindex find-file-not-found-functions
354 Two special hook variables allow extensions to modify the operation of
355 visiting files. Visiting a file that does not exist runs the functions
356 in the list @code{find-file-not-found-functions}; this variable holds a list
357 of functions, and the functions are called one by one (with no
358 arguments) until one of them returns non-@code{nil}. This is not a
359 normal hook, and the name ends in @samp{-functions} rather than @samp{-hook}
360 to indicate that fact.
361
362 Successful visiting of any file, whether existing or not, calls the
363 functions in the list @code{find-file-hook}, with no arguments.
364 This variable is a normal hook. In the case of a nonexistent file, the
365 @code{find-file-not-found-functions} are run first. @xref{Hooks}.
366
367 There are several ways to specify automatically the major mode for
368 editing the file (@pxref{Choosing Modes}), and to specify local
369 variables defined for that file (@pxref{File Variables}).
370
371 @node Saving
372 @section Saving Files
373
374 @dfn{Saving} a buffer in Emacs means writing its contents back into the file
375 that was visited in the buffer.
376
377 @menu
378 * Save Commands:: Commands for saving files.
379 * Backup:: How Emacs saves the old version of your file.
380 * Customize Save:: Customizing the saving of files.
381 * Interlocking:: How Emacs protects against simultaneous editing
382 of one file by two users.
383 * Shadowing: File Shadowing. Copying files to "shadows" automatically.
384 * Time Stamps:: Emacs can update time stamps on saved files.
385 @end menu
386
387 @node Save Commands
388 @subsection Commands for Saving Files
389
390 These are the commands that relate to saving and writing files.
391
392 @table @kbd
393 @item C-x C-s
394 Save the current buffer in its visited file on disk (@code{save-buffer}).
395 @item C-x s
396 Save any or all buffers in their visited files (@code{save-some-buffers}).
397 @item M-~
398 Forget that the current buffer has been changed (@code{not-modified}).
399 With prefix argument (@kbd{C-u}), mark the current buffer as changed.
400 @item C-x C-w
401 Save the current buffer with a specified file name (@code{write-file}).
402 @item M-x set-visited-file-name
403 Change the file name under which the current buffer will be saved.
404 @end table
405
406 @kindex C-x C-s
407 @findex save-buffer
408 When you wish to save the file and make your changes permanent, type
409 @kbd{C-x C-s} (@code{save-buffer}). After saving is finished, @kbd{C-x C-s}
410 displays a message like this:
411
412 @example
413 Wrote /u/rms/gnu/gnu.tasks
414 @end example
415
416 @noindent
417 If the selected buffer is not modified (no changes have been made in it
418 since the buffer was created or last saved), saving is not really done,
419 because it would have no effect. Instead, @kbd{C-x C-s} displays a message
420 like this in the echo area:
421
422 @example
423 (No changes need to be saved)
424 @end example
425
426 @kindex C-x s
427 @findex save-some-buffers
428 The command @kbd{C-x s} (@code{save-some-buffers}) offers to save any
429 or all modified buffers. It asks you what to do with each buffer. The
430 possible responses are analogous to those of @code{query-replace}:
431
432 @table @kbd
433 @item y
434 Save this buffer and ask about the rest of the buffers.
435 @item n
436 Don't save this buffer, but ask about the rest of the buffers.
437 @item !
438 Save this buffer and all the rest with no more questions.
439 @c following generates acceptable underfull hbox
440 @item @key{RET}
441 Terminate @code{save-some-buffers} without any more saving.
442 @item .
443 Save this buffer, then exit @code{save-some-buffers} without even asking
444 about other buffers.
445 @item C-r
446 View the buffer that you are currently being asked about. When you exit
447 View mode, you get back to @code{save-some-buffers}, which asks the
448 question again.
449 @item d
450 Diff the buffer against its corresponding file, so you can see
451 what changes you would be saving.
452 @item C-h
453 Display a help message about these options.
454 @end table
455
456 @kbd{C-x C-c}, the key sequence to exit Emacs, invokes
457 @code{save-some-buffers} and therefore asks the same questions.
458
459 @kindex M-~
460 @findex not-modified
461 If you have changed a buffer but you do not want to save the changes,
462 you should take some action to prevent it. Otherwise, each time you use
463 @kbd{C-x s} or @kbd{C-x C-c}, you are liable to save this buffer by
464 mistake. One thing you can do is type @kbd{M-~} (@code{not-modified}),
465 which clears out the indication that the buffer is modified. If you do
466 this, none of the save commands will believe that the buffer needs to be
467 saved. (@samp{~} is often used as a mathematical symbol for `not'; thus
468 @kbd{M-~} is `not', metafied.) You could also use
469 @code{set-visited-file-name} (see below) to mark the buffer as visiting
470 a different file name, one which is not in use for anything important.
471 Alternatively, you can cancel all the changes made since the file was
472 visited or saved, by reading the text from the file again. This is
473 called @dfn{reverting}. @xref{Reverting}. (You could also undo all the
474 changes by repeating the undo command @kbd{C-x u} until you have undone
475 all the changes; but reverting is easier.) You can also kill the buffer.
476
477 @findex set-visited-file-name
478 @kbd{M-x set-visited-file-name} alters the name of the file that the
479 current buffer is visiting. It reads the new file name using the
480 minibuffer. Then it marks the buffer as visiting that file name, and
481 changes the buffer name correspondingly. @code{set-visited-file-name}
482 does not save the buffer in the newly visited file; it just alters the
483 records inside Emacs in case you do save later. It also marks the
484 buffer as ``modified'' so that @kbd{C-x C-s} in that buffer
485 @emph{will} save.
486
487 @kindex C-x C-w
488 @findex write-file
489 If you wish to mark the buffer as visiting a different file and save it
490 right away, use @kbd{C-x C-w} (@code{write-file}). It is
491 equivalent to @code{set-visited-file-name} followed by @kbd{C-x C-s}
492 (except that @kbd{C-x C-w} asks for confirmation if the file exists).
493 @kbd{C-x C-s} used on a buffer that is not visiting a file has the
494 same effect as @kbd{C-x C-w}; that is, it reads a file name, marks the
495 buffer as visiting that file, and saves it there. The default file name in
496 a buffer that is not visiting a file is made by combining the buffer name
497 with the buffer's default directory (@pxref{File Names}).
498
499 If the new file name implies a major mode, then @kbd{C-x C-w} switches
500 to that major mode, in most cases. The command
501 @code{set-visited-file-name} also does this. @xref{Choosing Modes}.
502
503 If Emacs is about to save a file and sees that the date of the latest
504 version on disk does not match what Emacs last read or wrote, Emacs
505 notifies you of this fact, because it probably indicates a problem caused
506 by simultaneous editing and requires your immediate attention.
507 @xref{Interlocking,, Simultaneous Editing}.
508
509 @node Backup
510 @subsection Backup Files
511 @cindex backup file
512 @vindex make-backup-files
513 @vindex vc-make-backup-files
514
515 On most operating systems, rewriting a file automatically destroys all
516 record of what the file used to contain. Thus, saving a file from Emacs
517 throws away the old contents of the file---or it would, except that
518 Emacs carefully copies the old contents to another file, called the
519 @dfn{backup} file, before actually saving.
520
521 For most files, the variable @code{make-backup-files} determines
522 whether to make backup files. On most operating systems, its default
523 value is @code{t}, so that Emacs does write backup files.
524
525 For files managed by a version control system (@pxref{Version
526 Control}), the variable @code{vc-make-backup-files} determines whether
527 to make backup files. By default it is @code{nil}, since backup files
528 are redundant when you store all the previous versions in a version
529 control system.
530 @iftex
531 @xref{General VC Options,,,emacs-xtra, Specialized Emacs Features}.
532 @end iftex
533 @ifnottex
534 @xref{General VC Options}.
535 @end ifnottex
536
537
538 At your option, Emacs can keep either a single backup for each file,
539 or make a series of numbered backup files for each file that you edit.
540
541 @vindex backup-enable-predicate
542 @vindex temporary-file-directory
543 @vindex small-temporary-file-directory
544 The default value of the @code{backup-enable-predicate} variable
545 prevents backup files being written for files in the directories used
546 for temporary files, specified by @code{temporary-file-directory} or
547 @code{small-temporary-file-directory}.
548
549 Emacs makes a backup for a file only the first time the file is saved
550 from one buffer. No matter how many times you save a file, its backup file
551 continues to contain the contents from before the file was visited.
552 Normally this means that the backup file contains the contents from before
553 the current editing session; however, if you kill the buffer and then visit
554 the file again, a new backup file will be made by the next save.
555
556 You can also explicitly request making another backup file from a
557 buffer even though it has already been saved at least once. If you save
558 the buffer with @kbd{C-u C-x C-s}, the version thus saved will be made
559 into a backup file if you save the buffer again. @kbd{C-u C-u C-x C-s}
560 saves the buffer, but first makes the previous file contents into a new
561 backup file. @kbd{C-u C-u C-u C-x C-s} does both things: it makes a
562 backup from the previous contents, and arranges to make another from the
563 newly saved contents if you save again.
564
565 @menu
566 * One or Many: Numbered Backups. Whether to make one backup file or many.
567 * Names: Backup Names. How backup files are named.
568 * Deletion: Backup Deletion. Emacs deletes excess numbered backups.
569 * Copying: Backup Copying. Backups can be made by copying or renaming.
570 @end menu
571
572 @node Numbered Backups
573 @subsubsection Numbered Backups
574
575 @vindex version-control
576 The choice of single backup file or multiple numbered backup files
577 is controlled by the variable @code{version-control}. Its possible
578 values are:
579
580 @table @code
581 @item t
582 Make numbered backups.
583 @item nil
584 Make numbered backups for files that have numbered backups already.
585 Otherwise, make single backups.
586 @item never
587 Never make numbered backups; always make single backups.
588 @end table
589
590 @noindent
591 The usual way to set this variable is globally, through your
592 @file{.emacs} file or the customization buffer. However, you can set
593 @code{version-control} locally in an individual buffer to control the
594 making of backups for that buffer's file. For example, Rmail mode
595 locally sets @code{version-control} to @code{never} to make sure that
596 there is only one backup for an Rmail file. @xref{Locals}.
597
598 @cindex @env{VERSION_CONTROL} environment variable
599 If you set the environment variable @env{VERSION_CONTROL}, to tell
600 various GNU utilities what to do with backup files, Emacs also obeys the
601 environment variable by setting the Lisp variable @code{version-control}
602 accordingly at startup. If the environment variable's value is @samp{t}
603 or @samp{numbered}, then @code{version-control} becomes @code{t}; if the
604 value is @samp{nil} or @samp{existing}, then @code{version-control}
605 becomes @code{nil}; if it is @samp{never} or @samp{simple}, then
606 @code{version-control} becomes @code{never}.
607
608 @node Backup Names
609 @subsubsection Single or Numbered Backups
610
611 When Emacs makes a single backup file, its name is normally
612 constructed by appending @samp{~} to the file name being edited; thus,
613 the backup file for @file{eval.c} would be @file{eval.c~}.
614
615 @vindex make-backup-file-name-function
616 @vindex backup-directory-alist
617 You can change this behavior by defining the variable
618 @code{make-backup-file-name-function} to a suitable function.
619 Alternatively you can customize the variable
620 @code{backup-directory-alist} to specify that files matching certain
621 patterns should be backed up in specific directories.
622
623 A typical use is to add an element @code{("." . @var{dir})} to make
624 all backups in the directory with absolute name @var{dir}; Emacs
625 modifies the backup file names to avoid clashes between files with the
626 same names originating in different directories. Alternatively,
627 adding, say, @code{("." . ".~")} would make backups in the invisible
628 subdirectory @file{.~} of the original file's directory. Emacs
629 creates the directory, if necessary, to make the backup.
630
631 If access control stops Emacs from writing backup files under the usual
632 names, it writes the backup file as @file{%backup%~} in your home
633 directory. Only one such file can exist, so only the most recently
634 made such backup is available.
635
636 If you choose to have a series of numbered backup files, backup file
637 names contain @samp{.~}, the number, and another @samp{~} after the
638 original file name. Thus, the backup files of @file{eval.c} would be
639 called @file{eval.c.~1~}, @file{eval.c.~2~}, and so on, all the way
640 through names like @file{eval.c.~259~} and beyond. The variable
641 @code{backup-directory-alist} applies to numbered backups just as
642 usual.
643
644 @node Backup Deletion
645 @subsubsection Automatic Deletion of Backups
646
647 To prevent excessive consumption of disk space, Emacs can delete numbered
648 backup versions automatically. Generally Emacs keeps the first few backups
649 and the latest few backups, deleting any in between. This happens every
650 time a new backup is made.
651
652 @vindex kept-old-versions
653 @vindex kept-new-versions
654 The two variables @code{kept-old-versions} and
655 @code{kept-new-versions} control this deletion. Their values are,
656 respectively, the number of oldest (lowest-numbered) backups to keep
657 and the number of newest (highest-numbered) ones to keep, each time a
658 new backup is made. The backups in the middle (excluding those oldest
659 and newest) are the excess middle versions---those backups are
660 deleted. These variables' values are used when it is time to delete
661 excess versions, just after a new backup version is made; the newly
662 made backup is included in the count in @code{kept-new-versions}. By
663 default, both variables are 2.
664
665 @vindex delete-old-versions
666 If @code{delete-old-versions} is @code{t}, Emacs deletes the excess
667 backup files silently. If it is @code{nil}, the default, Emacs asks
668 you whether it should delete the excess backup versions. If it has
669 any other value, then Emacs never automatically deletes backups.
670
671 Dired's @kbd{.} (Period) command can also be used to delete old versions.
672 @xref{Dired Deletion}.
673
674 @node Backup Copying
675 @subsubsection Copying vs.@: Renaming
676
677 Backup files can be made by copying the old file or by renaming it.
678 This makes a difference when the old file has multiple names (hard
679 links). If the old file is renamed into the backup file, then the
680 alternate names become names for the backup file. If the old file is
681 copied instead, then the alternate names remain names for the file
682 that you are editing, and the contents accessed by those names will be
683 the new contents.
684
685 The method of making a backup file may also affect the file's owner
686 and group. If copying is used, these do not change. If renaming is used,
687 you become the file's owner, and the file's group becomes the default
688 (different operating systems have different defaults for the group).
689
690 Having the owner change is usually a good idea, because then the owner
691 always shows who last edited the file. Also, the owners of the backups
692 show who produced those versions. Occasionally there is a file whose
693 owner should not change; it is a good idea for such files to contain
694 local variable lists to set @code{backup-by-copying-when-mismatch}
695 locally (@pxref{File Variables}).
696
697 @vindex backup-by-copying
698 @vindex backup-by-copying-when-linked
699 @vindex backup-by-copying-when-mismatch
700 @vindex backup-by-copying-when-privileged-mismatch
701 @cindex file ownership, and backup
702 @cindex backup, and user-id
703 The choice of renaming or copying is controlled by four variables.
704 Renaming is the default choice. If the variable
705 @code{backup-by-copying} is non-@code{nil}, copying is used. Otherwise,
706 if the variable @code{backup-by-copying-when-linked} is non-@code{nil},
707 then copying is used for files that have multiple names, but renaming
708 may still be used when the file being edited has only one name. If the
709 variable @code{backup-by-copying-when-mismatch} is non-@code{nil}, then
710 copying is used if renaming would cause the file's owner or group to
711 change. @code{backup-by-copying-when-mismatch} is @code{t} by default
712 if you start Emacs as the superuser. The fourth variable,
713 @code{backup-by-copying-when-privileged-mismatch}, gives the highest
714 numeric user-id for which @code{backup-by-copying-when-mismatch} will be
715 forced on. This is useful when low-numbered user-ids are assigned to
716 special system users, such as @code{root}, @code{bin}, @code{daemon},
717 etc., which must maintain ownership of files.
718
719 When a file is managed with a version control system (@pxref{Version
720 Control}), Emacs does not normally make backups in the usual way for
721 that file. But check-in and check-out are similar in some ways to
722 making backups. One unfortunate similarity is that these operations
723 typically break hard links, disconnecting the file name you visited from
724 any alternate names for the same file. This has nothing to do with
725 Emacs---the version control system does it.
726
727 @node Customize Save
728 @subsection Customizing Saving of Files
729
730 @vindex require-final-newline
731 If the value of the variable @code{require-final-newline} is
732 @code{t}, saving or writing a file silently puts a newline at the end
733 if there isn't already one there. If the value is @code{visit}, Emacs
734 adds a newline at the end of any file that doesn't have one, just
735 after it visits the file. (This marks the buffer as modified, and you
736 can undo it.) If the value is @code{visit-save}, that means to add
737 newlines both on visiting and on saving. If the value is @code{nil},
738 Emacs leaves the end of the file unchanged; if it's neither @code{nil}
739 nor @code{t}, Emacs asks you whether to add a newline. The default is
740 @code{nil}.
741
742 @vindex mode-require-final-newline
743 Many major modes are designed for specific kinds of files that are
744 always supposed to end in newlines. These major modes set the
745 variable @code{require-final-newline} according to
746 @code{mode-require-final-newline}. By setting the latter variable,
747 you can control how these modes handle final newlines.
748
749 @vindex write-region-inhibit-fsync
750 When Emacs saves a file, it invokes the @code{fsync} system call to
751 force the data immediately out to disk. This is important for safety
752 if the system crashes or in case of power outage. However, it can be
753 disruptive on laptops using power saving, because it requires the disk
754 to spin up each time you save a file. Setting
755 @code{write-region-inhibit-fsync} to a non-@code{nil} value disables
756 this synchronization. Be careful---this means increased risk of data
757 loss.
758
759 @node Interlocking
760 @subsection Protection against Simultaneous Editing
761
762 @cindex file dates
763 @cindex simultaneous editing
764 Simultaneous editing occurs when two users visit the same file, both
765 make changes, and then both save them. If nobody were informed that
766 this was happening, whichever user saved first would later find that his
767 changes were lost.
768
769 On some systems, Emacs notices immediately when the second user starts
770 to change the file, and issues an immediate warning. On all systems,
771 Emacs checks when you save the file, and warns if you are about to
772 overwrite another user's changes. You can prevent loss of the other
773 user's work by taking the proper corrective action instead of saving the
774 file.
775
776 @findex ask-user-about-lock
777 @cindex locking files
778 When you make the first modification in an Emacs buffer that is
779 visiting a file, Emacs records that the file is @dfn{locked} by you.
780 (It does this by creating a symbolic link in the same directory with a
781 different name.) Emacs removes the lock when you save the changes. The
782 idea is that the file is locked whenever an Emacs buffer visiting it has
783 unsaved changes.
784
785 @cindex collision
786 If you begin to modify the buffer while the visited file is locked by
787 someone else, this constitutes a @dfn{collision}. When Emacs detects a
788 collision, it asks you what to do, by calling the Lisp function
789 @code{ask-user-about-lock}. You can redefine this function for the sake
790 of customization. The standard definition of this function asks you a
791 question and accepts three possible answers:
792
793 @table @kbd
794 @item s
795 Steal the lock. Whoever was already changing the file loses the lock,
796 and you gain the lock.
797 @item p
798 Proceed. Go ahead and edit the file despite its being locked by someone else.
799 @item q
800 Quit. This causes an error (@code{file-locked}), and the buffer
801 contents remain unchanged---the modification you were trying to make
802 does not actually take place.
803 @end table
804
805 Note that locking works on the basis of a file name; if a file has
806 multiple names, Emacs does not realize that the two names are the same file
807 and cannot prevent two users from editing it simultaneously under different
808 names. However, basing locking on names means that Emacs can interlock the
809 editing of new files that will not really exist until they are saved.
810
811 Some systems are not configured to allow Emacs to make locks, and
812 there are cases where lock files cannot be written. In these cases,
813 Emacs cannot detect trouble in advance, but it still can detect the
814 collision when you try to save a file and overwrite someone else's
815 changes.
816
817 If Emacs or the operating system crashes, this may leave behind lock
818 files which are stale, so you may occasionally get warnings about
819 spurious collisions. When you determine that the collision is spurious,
820 just use @kbd{p} to tell Emacs to go ahead anyway.
821
822 Every time Emacs saves a buffer, it first checks the last-modification
823 date of the existing file on disk to verify that it has not changed since the
824 file was last visited or saved. If the date does not match, it implies
825 that changes were made in the file in some other way, and these changes are
826 about to be lost if Emacs actually does save. To prevent this, Emacs
827 displays a warning message and asks for confirmation before saving.
828 Occasionally you will know why the file was changed and know that it does
829 not matter; then you can answer @kbd{yes} and proceed. Otherwise, you should
830 cancel the save with @kbd{C-g} and investigate the situation.
831
832 The first thing you should do when notified that simultaneous editing
833 has already taken place is to list the directory with @kbd{C-u C-x C-d}
834 (@pxref{Directories}). This shows the file's current author. You
835 should attempt to contact him to warn him not to continue editing.
836 Often the next step is to save the contents of your Emacs buffer under a
837 different name, and use @code{diff} to compare the two files.@refill
838
839 @node File Shadowing
840 @subsection Shadowing Files
841 @cindex shadow files
842 @cindex file shadows
843 @findex shadow-initialize
844
845 @table @kbd
846 @item M-x shadow-initialize
847 Set up file shadowing.
848 @item M-x shadow-define-literal-group
849 Declare a single file to be shared between sites.
850 @item M-x shadow-define-regexp-group
851 Make all files that match each of a group of files be shared between hosts.
852 @item M-x shadow-define-cluster @key{RET} @var{name} @key{RET}
853 Define a shadow file cluster @var{name}.
854 @item M-x shadow-copy-files
855 Copy all pending shadow files.
856 @item M-x shadow-cancel
857 Cancel the instruction to shadow some files.
858 @end table
859
860 You can arrange to keep identical @dfn{shadow} copies of certain files
861 in more than one place---possibly on different machines. To do this,
862 first you must set up a @dfn{shadow file group}, which is a set of
863 identically-named files shared between a list of sites. The file
864 group is permanent and applies to further Emacs sessions as well as
865 the current one. Once the group is set up, every time you exit Emacs,
866 it will copy the file you edited to the other files in its group. You
867 can also do the copying without exiting Emacs, by typing @kbd{M-x
868 shadow-copy-files}.
869
870 To set up a shadow file group, use @kbd{M-x
871 shadow-define-literal-group} or @kbd{M-x shadow-define-regexp-group}.
872 See their documentation strings for further information.
873
874 Before copying a file to its shadows, Emacs asks for confirmation.
875 You can answer ``no'' to bypass copying of this file, this time. If
876 you want to cancel the shadowing permanently for a certain file, use
877 @kbd{M-x shadow-cancel} to eliminate or change the shadow file group.
878
879 A @dfn{shadow cluster} is a group of hosts that share directories, so
880 that copying to or from one of them is sufficient to update the file
881 on all of them. Each shadow cluster has a name, and specifies the
882 network address of a primary host (the one we copy files to), and a
883 regular expression that matches the host names of all the other hosts
884 in the cluster. You can define a shadow cluster with @kbd{M-x
885 shadow-define-cluster}.
886
887 @node Time Stamps
888 @subsection Updating Time Stamps Automatically
889 @cindex time stamps
890 @cindex modification dates
891 @cindex locale, date format
892
893 You can arrange to put a time stamp in a file, so that it will be updated
894 automatically each time you edit and save the file. The time stamp
895 has to be in the first eight lines of the file, and you should
896 insert it like this:
897
898 @example
899 Time-stamp: <>
900 @end example
901
902 @noindent
903 or like this:
904
905 @example
906 Time-stamp: " "
907 @end example
908
909 @findex time-stamp
910 Then add the hook function @code{time-stamp} to the hook
911 @code{before-save-hook}; that hook function will automatically update
912 the time stamp, inserting the current date and time when you save the
913 file. You can also use the command @kbd{M-x time-stamp} to update the
914 time stamp manually. For other customizations, see the Custom group
915 @code{time-stamp}. Note that non-numeric fields in the time stamp are
916 formatted according to your locale setting (@pxref{Environment}).
917
918 @node Reverting
919 @section Reverting a Buffer
920 @findex revert-buffer
921 @cindex drastic changes
922 @cindex reread a file
923
924 If you have made extensive changes to a file and then change your mind
925 about them, you can get rid of them by reading in the previous version
926 of the file. To do this, use @kbd{M-x revert-buffer}, which operates on
927 the current buffer. Since reverting a buffer unintentionally could lose
928 a lot of work, you must confirm this command with @kbd{yes}.
929
930 @code{revert-buffer} tries to position point in such a way that, if
931 the file was edited only slightly, you will be at approximately the
932 same piece of text after reverting as before. However, if you have made
933 drastic changes, point may wind up in a totally different piece of text.
934
935 Reverting marks the buffer as ``not modified'' until another change is
936 made.
937
938 Some kinds of buffers whose contents reflect data bases other than files,
939 such as Dired buffers, can also be reverted. For them, reverting means
940 recalculating their contents from the appropriate data base. Buffers
941 created explicitly with @kbd{C-x b} cannot be reverted; @code{revert-buffer}
942 reports an error when asked to do so.
943
944 @vindex revert-without-query
945 When you edit a file that changes automatically and frequently---for
946 example, a log of output from a process that continues to run---it may be
947 useful for Emacs to revert the file without querying you, whenever you
948 visit the file again with @kbd{C-x C-f}.
949
950 To request this behavior, set the variable @code{revert-without-query}
951 to a list of regular expressions. When a file name matches one of these
952 regular expressions, @code{find-file} and @code{revert-buffer} will
953 revert it automatically if it has changed---provided the buffer itself
954 is not modified. (If you have edited the text, it would be wrong to
955 discard your changes.)
956
957 @cindex Global Auto-Revert mode
958 @cindex mode, Global Auto-Revert
959 @cindex Auto-Revert mode
960 @cindex mode, Auto-Revert
961 @findex global-auto-revert-mode
962 @findex auto-revert-mode
963 @findex auto-revert-tail-mode
964
965 You may find it useful to have Emacs revert files automatically when
966 they change. Three minor modes are available to do this.
967
968 @kbd{M-x global-auto-revert-mode} enables Global Auto-Revert mode,
969 which periodically checks all file buffers and reverts when the
970 corresponding file has changed. @kbd{M-x auto-revert-mode} enables a
971 local version, Auto-Revert mode, which applies only to the current
972 buffer.
973
974 You can use Auto-Revert mode to ``tail'' a file such as a system
975 log, so that changes made to that file by other programs are
976 continuously displayed. To do this, just move the point to the end of
977 the buffer, and it will stay there as the file contents change.
978 However, if you are sure that the file will only change by growing at
979 the end, use Auto-Revert Tail mode instead
980 (@code{auto-revert-tail-mode}). It is more efficient for this.
981
982 @vindex auto-revert-interval
983 The variable @code{auto-revert-interval} controls how often to check
984 for a changed file. Since checking a remote file is too slow, these
985 modes do not check or revert remote files.
986
987 @xref{VC Mode Line}, for Auto Revert peculiarities in buffers that
988 visit files under version control.
989
990 @ifnottex
991 @include arevert-xtra.texi
992 @end ifnottex
993
994 @node Auto Save
995 @section Auto-Saving: Protection Against Disasters
996 @cindex Auto Save mode
997 @cindex mode, Auto Save
998 @cindex crashes
999
1000 Emacs saves all the visited files from time to time (based on counting
1001 your keystrokes) without being asked. This is called @dfn{auto-saving}.
1002 It prevents you from losing more than a limited amount of work if the
1003 system crashes.
1004
1005 When Emacs determines that it is time for auto-saving, it considers
1006 each buffer, and each is auto-saved if auto-saving is enabled for it
1007 and it has been changed since the last time it was auto-saved. The
1008 message @samp{Auto-saving...} is displayed in the echo area during
1009 auto-saving, if any files are actually auto-saved. Errors occurring
1010 during auto-saving are caught so that they do not interfere with the
1011 execution of commands you have been typing.
1012
1013 @menu
1014 * Files: Auto Save Files. The file where auto-saved changes are
1015 actually made until you save the file.
1016 * Control: Auto Save Control. Controlling when and how often to auto-save.
1017 * Recover:: Recovering text from auto-save files.
1018 @end menu
1019
1020 @node Auto Save Files
1021 @subsection Auto-Save Files
1022
1023 Auto-saving does not normally save in the files that you visited, because
1024 it can be very undesirable to save a program that is in an inconsistent
1025 state when you have made half of a planned change. Instead, auto-saving
1026 is done in a different file called the @dfn{auto-save file}, and the
1027 visited file is changed only when you request saving explicitly (such as
1028 with @kbd{C-x C-s}).
1029
1030 Normally, the auto-save file name is made by appending @samp{#} to the
1031 front and rear of the visited file name. Thus, a buffer visiting file
1032 @file{foo.c} is auto-saved in a file @file{#foo.c#}. Most buffers that
1033 are not visiting files are auto-saved only if you request it explicitly;
1034 when they are auto-saved, the auto-save file name is made by appending
1035 @samp{#} to the front and rear of buffer name, then
1036 adding digits and letters at the end for uniqueness. For
1037 example, the @samp{*mail*} buffer in which you compose messages to be
1038 sent might be auto-saved in a file named @file{#*mail*#704juu}. Auto-save file
1039 names are made this way unless you reprogram parts of Emacs to do
1040 something different (the functions @code{make-auto-save-file-name} and
1041 @code{auto-save-file-name-p}). The file name to be used for auto-saving
1042 in a buffer is calculated when auto-saving is turned on in that buffer.
1043
1044 @cindex auto-save for remote files
1045 @vindex auto-save-file-name-transforms
1046 The variable @code{auto-save-file-name-transforms} allows a degree
1047 of control over the auto-save file name. It lets you specify a series
1048 of regular expressions and replacements to transform the auto save
1049 file name. The default value puts the auto-save files for remote
1050 files (@pxref{Remote Files}) into the temporary file directory on the
1051 local machine.
1052
1053 When you delete a substantial part of the text in a large buffer, auto
1054 save turns off temporarily in that buffer. This is because if you
1055 deleted the text unintentionally, you might find the auto-save file more
1056 useful if it contains the deleted text. To reenable auto-saving after
1057 this happens, save the buffer with @kbd{C-x C-s}, or use @kbd{C-u 1 M-x
1058 auto-save-mode}.
1059
1060 @vindex auto-save-visited-file-name
1061 If you want auto-saving to be done in the visited file rather than
1062 in a separate auto-save file, set the variable
1063 @code{auto-save-visited-file-name} to a non-@code{nil} value. In this
1064 mode, there is no real difference between auto-saving and explicit
1065 saving.
1066
1067 @vindex delete-auto-save-files
1068 A buffer's auto-save file is deleted when you save the buffer in its
1069 visited file. (You can inhibit this by setting the variable
1070 @code{delete-auto-save-files} to @code{nil}.) Changing the visited
1071 file name with @kbd{C-x C-w} or @code{set-visited-file-name} renames
1072 any auto-save file to go with the new visited name.
1073
1074 @node Auto Save Control
1075 @subsection Controlling Auto-Saving
1076
1077 @vindex auto-save-default
1078 @findex auto-save-mode
1079 Each time you visit a file, auto-saving is turned on for that file's
1080 buffer if the variable @code{auto-save-default} is non-@code{nil} (but not
1081 in batch mode; @pxref{Entering Emacs}). The default for this variable is
1082 @code{t}, so auto-saving is the usual practice for file-visiting buffers.
1083 Auto-saving can be turned on or off for any existing buffer with the
1084 command @kbd{M-x auto-save-mode}. Like other minor mode commands, @kbd{M-x
1085 auto-save-mode} turns auto-saving on with a positive argument, off with a
1086 zero or negative argument; with no argument, it toggles.
1087
1088 @vindex auto-save-interval
1089 Emacs does auto-saving periodically based on counting how many characters
1090 you have typed since the last time auto-saving was done. The variable
1091 @code{auto-save-interval} specifies how many characters there are between
1092 auto-saves. By default, it is 300. Emacs doesn't accept values that are
1093 too small: if you customize @code{auto-save-interval} to a value less
1094 than 20, Emacs will behave as if the value is 20.
1095
1096 @vindex auto-save-timeout
1097 Auto-saving also takes place when you stop typing for a while. The
1098 variable @code{auto-save-timeout} says how many seconds Emacs should
1099 wait before it does an auto save (and perhaps also a garbage
1100 collection). (The actual time period is longer if the current buffer is
1101 long; this is a heuristic which aims to keep out of your way when you
1102 are editing long buffers, in which auto-save takes an appreciable amount
1103 of time.) Auto-saving during idle periods accomplishes two things:
1104 first, it makes sure all your work is saved if you go away from the
1105 terminal for a while; second, it may avoid some auto-saving while you
1106 are actually typing.
1107
1108 Emacs also does auto-saving whenever it gets a fatal error. This
1109 includes killing the Emacs job with a shell command such as @samp{kill
1110 %emacs}, or disconnecting a phone line or network connection.
1111
1112 @findex do-auto-save
1113 You can request an auto-save explicitly with the command @kbd{M-x
1114 do-auto-save}.
1115
1116 @node Recover
1117 @subsection Recovering Data from Auto-Saves
1118
1119 @findex recover-file
1120 You can use the contents of an auto-save file to recover from a loss
1121 of data with the command @kbd{M-x recover-file @key{RET} @var{file}
1122 @key{RET}}. This visits @var{file} and then (after your confirmation)
1123 restores the contents from its auto-save file @file{#@var{file}#}.
1124 You can then save with @kbd{C-x C-s} to put the recovered text into
1125 @var{file} itself. For example, to recover file @file{foo.c} from its
1126 auto-save file @file{#foo.c#}, do:@refill
1127
1128 @example
1129 M-x recover-file @key{RET} foo.c @key{RET}
1130 yes @key{RET}
1131 C-x C-s
1132 @end example
1133
1134 Before asking for confirmation, @kbd{M-x recover-file} displays a
1135 directory listing describing the specified file and the auto-save file,
1136 so you can compare their sizes and dates. If the auto-save file
1137 is older, @kbd{M-x recover-file} does not offer to read it.
1138
1139 @findex recover-session
1140 If Emacs or the computer crashes, you can recover all the files you
1141 were editing from their auto save files with the command @kbd{M-x
1142 recover-session}. This first shows you a list of recorded interrupted
1143 sessions. Move point to the one you choose, and type @kbd{C-c C-c}.
1144
1145 Then @code{recover-session} asks about each of the files that were
1146 being edited during that session, asking whether to recover that file.
1147 If you answer @kbd{y}, it calls @code{recover-file}, which works in its
1148 normal fashion. It shows the dates of the original file and its
1149 auto-save file, and asks once again whether to recover that file.
1150
1151 When @code{recover-session} is done, the files you've chosen to
1152 recover are present in Emacs buffers. You should then save them. Only
1153 this---saving them---updates the files themselves.
1154
1155 @vindex auto-save-list-file-prefix
1156 Emacs records information about interrupted sessions for later
1157 recovery in files named
1158 @file{~/.emacs.d/auto-save-list/.saves-@var{pid}-@var{hostname}}. All
1159 of this name except the @file{@var{pid}-@var{hostname}} part comes
1160 from the value of @code{auto-save-list-file-prefix}. You can record
1161 sessions in a different place by customizing that variable. If you
1162 set @code{auto-save-list-file-prefix} to @code{nil} in your
1163 @file{.emacs} file, sessions are not recorded for recovery.
1164
1165 @node File Aliases
1166 @section File Name Aliases
1167 @cindex symbolic links (visiting)
1168 @cindex hard links (visiting)
1169
1170 Symbolic links and hard links both make it possible for several file
1171 names to refer to the same file. Hard links are alternate names that
1172 refer directly to the file; all the names are equally valid, and no one
1173 of them is preferred. By contrast, a symbolic link is a kind of defined
1174 alias: when @file{foo} is a symbolic link to @file{bar}, you can use
1175 either name to refer to the file, but @file{bar} is the real name, while
1176 @file{foo} is just an alias. More complex cases occur when symbolic
1177 links point to directories.
1178
1179 @vindex find-file-existing-other-name
1180 @vindex find-file-suppress-same-file-warnings
1181
1182 Normally, if you visit a file which Emacs is already visiting under
1183 a different name, Emacs displays a message in the echo area and uses
1184 the existing buffer visiting that file. This can happen on systems
1185 that support hard or symbolic links, or if you use a long file name on
1186 a system that truncates long file names, or on a case-insensitive file
1187 system. You can suppress the message by setting the variable
1188 @code{find-file-suppress-same-file-warnings} to a non-@code{nil}
1189 value. You can disable this feature entirely by setting the variable
1190 @code{find-file-existing-other-name} to @code{nil}: then if you visit
1191 the same file under two different names, you get a separate buffer for
1192 each file name.
1193
1194 @vindex find-file-visit-truename
1195 @cindex truenames of files
1196 @cindex file truenames
1197 If the variable @code{find-file-visit-truename} is non-@code{nil},
1198 then the file name recorded for a buffer is the file's @dfn{truename}
1199 (made by replacing all symbolic links with their target names), rather
1200 than the name you specify. Setting @code{find-file-visit-truename} also
1201 implies the effect of @code{find-file-existing-other-name}.
1202
1203 @node Version Control
1204 @section Version Control
1205 @cindex version control
1206
1207 @dfn{Version control systems} are packages that can record multiple
1208 versions of a source file, usually storing the unchanged parts of the
1209 file just once. Version control systems also record history information
1210 such as the creation time of each version, who created it, and a
1211 description of what was changed in that version.
1212
1213 The Emacs version control interface is called VC. Its commands work
1214 with different version control systems---currently, it supports CVS,
1215 GNU Arch, RCS, Meta-CVS, Subversion, and SCCS. Of these, the GNU
1216 project distributes CVS, GNU Arch, and RCS; we recommend that you use
1217 either CVS or GNU Arch for your projects, and RCS for individual
1218 files. We also have free software to replace SCCS, known as CSSC; if
1219 you are using SCCS and don't want to make the incompatible change to
1220 RCS or CVS, you can switch to CSSC.
1221
1222 VC is enabled by default in Emacs. To disable it, set the
1223 customizable variable @code{vc-handled-backends} to @code{nil}
1224 @iftex
1225 (@pxref{Customizing VC,,,emacs-xtra, Specialized Emacs Features}).
1226 @end iftex
1227 @ifnottex
1228 (@pxref{Customizing VC}).
1229 @end ifnottex
1230
1231
1232 @menu
1233 * Introduction to VC:: How version control works in general.
1234 * VC Mode Line:: How the mode line shows version control status.
1235 * Basic VC Editing:: How to edit a file under version control.
1236 * Old Versions:: Examining and comparing old versions.
1237 * Secondary VC Commands:: The commands used a little less frequently.
1238 * Branches:: Multiple lines of development.
1239 @ifnottex
1240 * Remote Repositories:: Efficient access to remote CVS servers.
1241 * Snapshots:: Sets of file versions treated as a unit.
1242 * Miscellaneous VC:: Various other commands and features of VC.
1243 * Customizing VC:: Variables that change VC's behavior.
1244 @end ifnottex
1245 @end menu
1246
1247 @node Introduction to VC
1248 @subsection Introduction to Version Control
1249
1250 VC allows you to use a version control system from within Emacs,
1251 integrating the version control operations smoothly with editing. VC
1252 provides a uniform interface to version control, so that regardless of
1253 which version control system is in use, you can use it the same way.
1254
1255 This section provides a general overview of version control, and
1256 describes the version control systems that VC supports. You can skip
1257 this section if you are already familiar with the version control system
1258 you want to use.
1259
1260 @menu
1261 * Why Version Control?:: Understanding the problems it addresses
1262 * Version Systems:: Supported version control back-end systems.
1263 * VC Concepts:: Words and concepts related to version control.
1264 * Types of Log File:: The per-file VC log in contrast to the ChangeLog.
1265 @end menu
1266
1267 @node Why Version Control?
1268 @subsubsection Understanding the problems it addresses
1269
1270 Version control systems provide you with three important capabilities:
1271 reversibility, concurrency, and history.
1272
1273 The most basic capability you get from a version-control system is
1274 reversibility, the ability to back up to a saved, known-good state when
1275 you discover that some modification you did was a mistake or a bad idea.
1276
1277 Version-control systems also support concurrency, the ability to
1278 have many people modifying the same collection of code or documents
1279 knowing that conflicting modifications can be detected and resolved.
1280
1281 Version-control systems give you the capability to attach a history
1282 to your data, explanatory comments about the intention behind each
1283 change to it. Even for a programmer working solo change histories
1284 are an important aid to memory; for a multi-person project they
1285 become a vitally important form of communication among developers.
1286
1287 @node Version Systems
1288 @subsubsection Supported Version Control Systems
1289
1290 @cindex back end (version control)
1291 VC currently works with six different version control systems or
1292 ``back ends'': CVS, GNU Arch, RCS, Meta-CVS, Subversion, and SCCS.
1293
1294 @cindex CVS
1295 CVS is a free version control system that is used for the majority
1296 of free software projects today. It allows concurrent multi-user
1297 development either locally or over the network. Some of its
1298 shortcomings, corrected by newer systems such as GNU Arch, are that it
1299 lacks atomic commits or support for renaming files. VC supports all
1300 basic editing operations under CVS, but for some less common tasks you
1301 still need to call CVS from the command line. Note also that before
1302 using CVS you must set up a repository, which is a subject too complex
1303 to treat here.
1304
1305 @cindex GNU Arch
1306 @cindex Arch
1307 GNU Arch is a new version control system that is designed for
1308 distributed work. It differs in many ways from old well-known
1309 systems, such as CVS and RCS. It supports different transports for
1310 interoperating between users, offline operations, and it has good
1311 branching and merging features. It also supports atomic commits, and
1312 history of file renaming and moving. VC does not support all
1313 operations provided by GNU Arch, so you must sometimes invoke it from
1314 the command line, or use a specialized module.
1315
1316 @cindex RCS
1317 RCS is the free version control system around which VC was initially
1318 built. The VC commands are therefore conceptually closest to RCS.
1319 Almost everything you can do with RCS can be done through VC. You
1320 cannot use RCS over the network though, and it only works at the level
1321 of individual files, rather than projects. You should use it if you
1322 want a simple, yet reliable tool for handling individual files.
1323
1324 @cindex SVN
1325 @cindex Subversion
1326 Subversion is a free version control system designed to be similar
1327 to CVS but without CVS's problems. Subversion supports atomic commits,
1328 and versions directories, symbolic links, meta-data, renames, copies,
1329 and deletes. It can be used via http or via its own protocol.
1330
1331 @cindex MCVS
1332 @cindex Meta-CVS
1333 Meta-CVS is another attempt to solve problems arising in CVS. It
1334 supports directory structure versioning, improved branching and
1335 merging, and use of symbolic links and meta-data in repositories.
1336
1337 @cindex SCCS
1338 SCCS is a proprietary but widely used version control system. In
1339 terms of capabilities, it is the weakest of the six that VC supports.
1340 VC compensates for certain features missing in SCCS (snapshots, for
1341 example) by implementing them itself, but some other VC features, such
1342 as multiple branches, are not available with SCCS. Since SCCS is
1343 non-free, not respecting its users freedom, you should not use it;
1344 use its free replacement CSSC instead. But you should use CSSC only
1345 if for some reason you cannot use RCS, or one of the higher-level
1346 systems such as CVS or GNU Arch.
1347
1348 In the following, we discuss mainly RCS, SCCS and CVS. Nearly
1349 everything said about CVS applies to GNU Arch, Subversion and Meta-CVS
1350 as well.
1351
1352 @node VC Concepts
1353 @subsubsection Concepts of Version Control
1354
1355 @cindex master file
1356 @cindex registered file
1357 When a file is under version control, we also say that it is
1358 @dfn{registered} in the version control system. Each registered file
1359 has a corresponding @dfn{master file} which represents the file's
1360 present state plus its change history---enough to reconstruct the
1361 current version or any earlier version. Usually the master file also
1362 records a @dfn{log entry} for each version, describing in words what was
1363 changed in that version.
1364
1365 @cindex work file
1366 @cindex checking out files
1367 The file that is maintained under version control is sometimes called
1368 the @dfn{work file} corresponding to its master file. You edit the work
1369 file and make changes in it, as you would with an ordinary file. (With
1370 SCCS and RCS, you must @dfn{lock} the file before you start to edit it.)
1371 After you are done with a set of changes, you @dfn{check the file in},
1372 which records the changes in the master file, along with a log entry for
1373 them.
1374
1375 To go beyond these basic concepts, you will need to understand three
1376 ways in which version-control systems can differ from each other. They
1377 can be locking or merging; they can be file-based or changeset-based;
1378 and they can be centralized or decentralized. VC handles all these
1379 choices, but they lead to differing behaviors which you will need
1380 to understand as you use it.
1381
1382 @cindex locking versus merging
1383 A version control system typically has some mechanism to coordinate
1384 between users who want to change the same file. One method is
1385 @dfn{locking} (analogous to the locking that Emacs uses to detect
1386 simultaneous editing of a file, but distinct from it). In a locking
1387 system, such as SCCS, you must @dfn{lock} a file before you start to
1388 edit it. The other method is @dfn{merging}; the system tries to
1389 merge your changes with other people's changes when you check them in.
1390
1391 With version control locking, work files are normally read-only so
1392 that you cannot change them. You ask the version control system to make
1393 a work file writable for you by locking it; only one user can do
1394 this at any given time. When you check in your changes, that unlocks
1395 the file, making the work file read-only again. This allows other users
1396 to lock the file to make further changes.
1397
1398 By contrast, a merging system lets each user check out and modify a
1399 work file at any time. When you check in a a file, the system will
1400 attempt to merge your changes with any others checked into the
1401 repository since you checked out the file.
1402
1403 Both locking and merging systems can have problems when multiple users
1404 try to modify the same file at the same time. Locking systems have
1405 @dfn{lock conflicts}; a user may try to check a file out and be unable
1406 to because it is locked. In merging systems, @dfn{merge conflicts}
1407 happen when you check in a change to a file that conflicts with a change
1408 checked in by someone else after your checkout. Both kinds of conflict
1409 have to be resolved by human judgment and communication.
1410
1411 SCCS always uses locking. RCS is lock-based by default but can be told
1412 to operate in a merging style. CVS is merge-based by default but can
1413 be told to operate in a locking mode. Most later version-control
1414 systems, such as Subversion and GNU Arch, have been fundamentally
1415 merging-based rather than locking-based. This is because experience
1416 has shown that the merging-based approach is generally superior to
1417 the locking one, both in convenience to developers and in minimizing
1418 the number and severity of conflicts that actually occur.
1419
1420 While it is rather unlikely that anyone will ever again build a
1421 fundamentally locking-based rather than merging-based version-control
1422 system in the future, merging-based version-systems sometimes have locks
1423 retrofitted onto them for reasons having nothing to do with technology.
1424 @footnote{Usually the control-freak instincts of managers.} For this
1425 reason, and to support older systems still in use, VC mode supports
1426 both locking and merging version control and tries to hide the differences
1427 between them as much as possible.
1428
1429 @cindex files versus changesets.
1430 On SCCS, RCS, CVS, and other early version-control systems, checkins
1431 and other operations are @dfn{file-based}; each file has its own
1432 @dfn{master file} with its own comment- and revision history separate
1433 from that of all other files in the system. Later systems, beginning
1434 with Subversion, are @dfn{changeset-based}; a checkin may include
1435 changes to several files and that change set is treated as a unit by the
1436 system. Any comment associated with the change doesn't belong to any
1437 one file, but is attached to the changeset itself.
1438
1439 Changeset-based version control is in general both more flexible and
1440 more powerful than file-based version control; usually, when a change to
1441 multiple files has to be backed out, it's good to be able to easily
1442 identify and remove all of it.
1443
1444 @cindex centralized vs. decentralized
1445 Early version-control systems were designed around a @dfn{centralized}
1446 model in which each project has only one repository used by all
1447 developers. SCCS, RCS, CVS, and Subversion share this kind of model.
1448 It has two important problems. One is that a single repository is a
1449 single point of failure---if the repository server is down all work
1450 stops. The other is that you need to be connected live to the server to
1451 do checkins and checkouts; if you're offline, you can't work.
1452
1453 Newer version-control systems like GNU Arch are @dfn{decentralized}.
1454 A project may have several different repositories, and these systems
1455 support a sort of super-merge between repositories that tries to
1456 reconcile their change histories. At the limit, each developer has
1457 his/her own repository, and repository merges replace checkin/commit
1458 operations.
1459
1460 VC's job is to help you manage the traffic between your personal
1461 workfiles and a repository. Whether that repository is a single master
1462 or one of a network of peer repositories is not something VC has to care
1463 about. Thus, the difference between a centralized and a decentralized
1464 version-control system is invisible to VC mode.
1465
1466 @iftex
1467 (@pxref{CVS Options,,,emacs-xtra, Specialized Emacs Features}).
1468 @end iftex
1469 @ifnottex
1470 (@pxref{CVS Options}).
1471 @end ifnottex
1472
1473
1474 @node Types of Log File
1475 @subsubsection Types of Log File
1476 @cindex types of log file
1477 @cindex log File, types of
1478 @cindex version control log
1479
1480 Projects that use a revision control system can have @emph{two}
1481 types of log for changes. One is the per-file log maintained by the
1482 revision control system: each time you check in a change, you must
1483 fill out a @dfn{log entry} for the change (@pxref{Log Buffer}). This
1484 kind of log is called the @dfn{version control log}, also the
1485 @dfn{revision control log}, @dfn{RCS log}, or @dfn{CVS log}.
1486
1487 The other kind of log is the file @file{ChangeLog} (@pxref{Change
1488 Log}). It provides a chronological record of all changes to a large
1489 portion of a program---typically one directory and its subdirectories.
1490 A small program would use one @file{ChangeLog} file; a large program
1491 may well merit a @file{ChangeLog} file in each major directory.
1492 @xref{Change Log}.
1493
1494 A project maintained with version control can use just the per-file
1495 log, or it can use both kinds of logs. It can handle some files one
1496 way and some files the other way. Each project has its policy, which
1497 you should follow.
1498
1499 When the policy is to use both, you typically want to write an entry
1500 for each change just once, then put it into both logs. You can write
1501 the entry in @file{ChangeLog}, then copy it to the log buffer when you
1502 check in the change. Or you can write the entry in the log buffer
1503 while checking in the change, and later use the @kbd{C-x v a} command
1504 to copy it to @file{ChangeLog}
1505 @iftex
1506 (@pxref{Change Logs and VC,,,emacs-xtra, Specialized Emacs Features}).
1507 @end iftex
1508 @ifnottex
1509 (@pxref{Change Logs and VC}).
1510 @end ifnottex
1511
1512
1513 @node VC Mode Line
1514 @subsection Version Control and the Mode Line
1515
1516 When you visit a file that is under version control, Emacs indicates
1517 this on the mode line. For example, @samp{RCS-1.3} says that RCS is
1518 used for that file, and the current version is 1.3.
1519
1520 The character between the back-end name and the version number
1521 indicates the version control status of the file. @samp{-} means that
1522 the work file is not locked (if locking is in use), or not modified (if
1523 locking is not in use). @samp{:} indicates that the file is locked, or
1524 that it is modified. If the file is locked by some other user (for
1525 instance, @samp{jim}), that is displayed as @samp{RCS:jim:1.3}.
1526
1527 @vindex auto-revert-check-vc-info
1528 When Auto Revert mode (@pxref{Reverting}) reverts a buffer that is
1529 under version control, it updates the version control information in
1530 the mode line. However, Auto Revert mode may not properly update this
1531 information if the version control status changes without changes to
1532 the work file, from outside the current Emacs session. If you set
1533 @code{auto-revert-check-vc-info} to @code{t}, Auto Revert mode updates
1534 the version control status information every
1535 @code{auto-revert-interval} seconds, even if the work file itself is
1536 unchanged. The resulting CPU usage depends on the version control
1537 system, but is usually not excessive.
1538
1539 @node Basic VC Editing
1540 @subsection Basic Editing under Version Control
1541
1542 The principal VC command is an all-purpose command that performs
1543 either locking or check-in, depending on the situation.
1544
1545 @table @kbd
1546 @itemx C-x v v
1547 Perform the next logical version control operation on this file.
1548 @end table
1549
1550 @findex vc-next-action
1551 @kindex C-x v v
1552 The precise action of this command depends on the state of the file,
1553 and whether the version control system uses locking or not. SCCS and
1554 RCS normally use locking; CVS normally does not use locking.
1555
1556 @findex vc-toggle-read-only
1557 @kindex C-x C-q @r{(Version Control)}
1558 As a special convenience that is particularly useful for files with
1559 locking, you can let Emacs check a file in or out whenever you change
1560 its read-only flag. This means, for example, that you cannot
1561 accidentally edit a file without properly checking it out first. To
1562 achieve this, bind the key @kbd{C-x C-q} to @kbd{vc-toggle-read-only}
1563 in your @file{~/.emacs} file. (@xref{Init Rebinding}.)
1564
1565 @menu
1566 * VC with Locking:: RCS in its default mode, SCCS, and optionally CVS.
1567 * Without Locking:: Without locking: default mode for CVS.
1568 * Advanced C-x v v:: Advanced features available with a prefix argument.
1569 * Log Buffer:: Features available in log entry buffers.
1570 @end menu
1571
1572 @node VC with Locking
1573 @subsubsection Basic Version Control with Locking
1574
1575 If locking is used for the file (as with SCCS, and RCS in its default
1576 mode), @kbd{C-x v v} can either lock a file or check it in:
1577
1578 @itemize @bullet
1579 @item
1580 If the file is not locked, @kbd{C-x v v} locks it, and
1581 makes it writable so that you can change it.
1582
1583 @item
1584 If the file is locked by you, and contains changes, @kbd{C-x v v} checks
1585 in the changes. In order to do this, it first reads the log entry
1586 for the new version. @xref{Log Buffer}.
1587
1588 @item
1589 If the file is locked by you, but you have not changed it since you
1590 locked it, @kbd{C-x v v} releases the lock and makes the file read-only
1591 again.
1592
1593 @item
1594 If the file is locked by some other user, @kbd{C-x v v} asks you whether
1595 you want to ``steal the lock'' from that user. If you say yes, the file
1596 becomes locked by you, but a message is sent to the person who had
1597 formerly locked the file, to inform him of what has happened.
1598 @end itemize
1599
1600 These rules also apply when you use CVS in locking mode, except
1601 that there is no such thing as stealing a lock.
1602
1603 @node Without Locking
1604 @subsubsection Basic Version Control without Locking
1605
1606 When there is no locking---the default for CVS---work files are always
1607 writable; you do not need to do anything before you begin to edit a
1608 file. The status indicator on the mode line is @samp{-} if the file is
1609 unmodified; it flips to @samp{:} as soon as you save any changes in the
1610 work file.
1611
1612 Here is what @kbd{C-x v v} does when using CVS:
1613
1614 @itemize @bullet
1615 @item
1616 If some other user has checked in changes into the master file, Emacs
1617 asks you whether you want to merge those changes into your own work
1618 file. You must do this before you can check in your own changes. (To
1619 pick up any recent changes from the master file @emph{without} trying
1620 to commit your own changes, type @kbd{C-x v m @key{RET}}.)
1621 @xref{Merging}.
1622
1623 @item
1624 If there are no new changes in the master file, but you have made
1625 modifications in your work file, @kbd{C-x v v} checks in your changes.
1626 In order to do this, it first reads the log entry for the new version.
1627 @xref{Log Buffer}.
1628
1629 @item
1630 If the file is not modified, the @kbd{C-x v v} does nothing.
1631 @end itemize
1632
1633 These rules also apply when you use RCS in the mode that does not
1634 require locking, except that automatic merging of changes from the
1635 master file is not implemented. Unfortunately, this means that nothing
1636 informs you if another user has checked in changes in the same file
1637 since you began editing it, and when this happens, his changes will be
1638 effectively removed when you check in your version (though they will
1639 remain in the master file, so they will not be entirely lost). You must
1640 therefore verify that the current version is unchanged, before you
1641 check in your changes. We hope to eliminate this risk and provide
1642 automatic merging with RCS in a future Emacs version.
1643
1644 In addition, locking is possible with RCS even in this mode, although
1645 it is not required; @kbd{C-x v v} with an unmodified file locks the
1646 file, just as it does with RCS in its normal (locking) mode.
1647
1648 @node Advanced C-x v v
1649 @subsubsection Advanced Control in @kbd{C-x v v}
1650
1651 @cindex version number to check in/out
1652 When you give a prefix argument to @code{vc-next-action} (@kbd{C-u
1653 C-x v v}), it still performs the next logical version control
1654 operation, but accepts additional arguments to specify precisely how
1655 to do the operation.
1656
1657 @itemize @bullet
1658 @item
1659 If the file is modified (or locked), you can specify the version
1660 number to use for the new version that you check in. This is one way
1661 to create a new branch (@pxref{Branches}).
1662
1663 @item
1664 If the file is not modified (and unlocked), you can specify the
1665 version to select; this lets you start working from an older version,
1666 or on another branch. If you do not enter any version, that takes you
1667 to the highest version on the current branch; therefore @kbd{C-u C-x
1668 v v @key{RET}} is a convenient way to get the latest version of a file from
1669 the repository.
1670
1671 @item
1672 @cindex specific version control system
1673 Instead of the version number, you can also specify the name of a
1674 version control system. This is useful when one file is being managed
1675 with two version control systems at the same time
1676 @iftex
1677 (@pxref{Local Version Control,,,emacs-xtra, Specialized Emacs
1678 Features}).
1679 @end iftex
1680 @ifnottex
1681 (@pxref{Local Version Control}).
1682 @end ifnottex
1683
1684 @end itemize
1685
1686 @node Log Buffer
1687 @subsubsection Features of the Log Entry Buffer
1688
1689 When you check in changes, @kbd{C-x v v} first reads a log entry. It
1690 pops up a buffer called @samp{*VC-Log*} for you to enter the log entry.
1691
1692 Sometimes the @samp{*VC-Log*} buffer contains default text when you enter it,
1693 typically the last log message entered. If it does, mark and point
1694 are set around the entire contents of the buffer so that it is easy to
1695 kill the contents of the buffer with @kbd{C-w}.
1696
1697 @findex log-edit-insert-changelog
1698 If you work by writing entries in the @file{ChangeLog}
1699 (@pxref{Change Log}) and then commit the change under revision
1700 control, you can generate the Log Edit text from the ChangeLog using
1701 @kbd{C-c C-a} (@kbd{log-edit-insert-changelog}). This looks for
1702 entries for the file(s) concerned in the top entry in the ChangeLog
1703 and uses those paragraphs as the log text. This text is only inserted
1704 if the top entry was made under your user name on the current date.
1705 @iftex
1706 @xref{Change Logs and VC,,,emacs-xtra, Specialized Emacs Features},
1707 @end iftex
1708 @ifnottex
1709 @xref{Change Logs and VC},
1710 @end ifnottex
1711 for the opposite way of working---generating ChangeLog entries from
1712 the revision control log.
1713
1714 In the @samp{*VC-Log*} buffer, @kbd{C-c C-f} (@kbd{M-x
1715 log-edit-show-files}) shows the list of files to be committed in case
1716 you need to check that. (This can be a list of more than one file if
1717 you use VC Dired mode or PCL-CVS.
1718 @iftex
1719 @xref{VC Dired Mode,,,emacs-xtra, Specialized Emacs Features},
1720 @end iftex
1721 @ifnottex
1722 @xref{VC Dired Mode},
1723 @end ifnottex
1724 and @ref{Top, , About PCL-CVS, pcl-cvs, PCL-CVS --- The Emacs
1725 Front-End to CVS}.)
1726
1727 When you have finished editing the log message, type @kbd{C-c C-c} to
1728 exit the buffer and commit the change.
1729
1730 To abort check-in, just @strong{don't} type @kbd{C-c C-c} in that
1731 buffer. You can switch buffers and do other editing. As long as you
1732 don't try to check in another file, the entry you were editing remains
1733 in the @samp{*VC-Log*} buffer, and you can go back to that buffer at any
1734 time to complete the check-in.
1735
1736 If you change several source files for the same reason, it is often
1737 convenient to specify the same log entry for many of the files. To do
1738 this, use the history of previous log entries. The commands @kbd{M-n},
1739 @kbd{M-p}, @kbd{M-s} and @kbd{M-r} for doing this work just like the
1740 minibuffer history commands (except that these versions are used outside
1741 the minibuffer).
1742
1743 @vindex vc-log-mode-hook
1744 Each time you check in a file, the log entry buffer is put into VC Log
1745 mode, which involves running two hooks: @code{text-mode-hook} and
1746 @code{vc-log-mode-hook}. @xref{Hooks}.
1747
1748 @node Old Versions
1749 @subsection Examining And Comparing Old Versions
1750
1751 One of the convenient features of version control is the ability
1752 to examine any version of a file, or compare two versions.
1753
1754 @table @kbd
1755 @item C-x v ~ @var{version} @key{RET}
1756 Examine version @var{version} of the visited file, in a buffer of its
1757 own.
1758
1759 @item C-x v =
1760 Compare the current buffer contents with the master version from which
1761 you started editing.
1762
1763 @item C-u C-x v = @var{file} @key{RET} @var{oldvers} @key{RET} @var{newvers} @key{RET}
1764 Compare the specified two versions of @var{file}.
1765
1766 @item C-x v g
1767 Display the file with per-line version information and using colors.
1768 @end table
1769
1770 @findex vc-version-other-window
1771 @kindex C-x v ~
1772 To examine an old version in its entirety, visit the file and then type
1773 @kbd{C-x v ~ @var{version} @key{RET}} (@code{vc-version-other-window}).
1774 This puts the text of version @var{version} in a file named
1775 @file{@var{filename}.~@var{version}~}, and visits it in its own buffer
1776 in a separate window. (In RCS, you can also select an old version
1777 and create a branch from it. @xref{Branches}.)
1778
1779 @findex vc-diff
1780 @kindex C-x v =
1781 It is usually more convenient to compare two versions of the file,
1782 with the command @kbd{C-x v =} (@code{vc-diff}). Plain @kbd{C-x v =}
1783 compares the current buffer contents (saving them in the file if
1784 necessary) with the master version from which you started editing the
1785 file (this is not necessarily the latest version of the file).
1786 @kbd{C-u C-x v =}, with a numeric argument, reads a file name and two
1787 version numbers, then compares those versions of the specified file.
1788 Both forms display the output in a special buffer in another window.
1789
1790 You can specify a checked-in version by its number; an empty input
1791 specifies the current contents of the work file (which may be different
1792 from all the checked-in versions). You can also specify a snapshot name
1793 @iftex
1794 (@pxref{Snapshots,,,emacs-xtra, Specialized Emacs Features})
1795 @end iftex
1796 @ifnottex
1797 (@pxref{Snapshots})
1798 @end ifnottex
1799 instead of one or both version numbers.
1800
1801 If you supply a directory name instead of the name of a registered
1802 file, this command compares the two specified versions of all registered
1803 files in that directory and its subdirectories.
1804
1805 @vindex vc-diff-switches
1806 @vindex vc-rcs-diff-switches
1807 @kbd{C-x v =} works by running a variant of the @code{diff} utility
1808 designed to work with the version control system in use. When you
1809 invoke @code{diff} this way, in addition to the options specified by
1810 @code{diff-switches} (@pxref{Comparing Files}), it receives those
1811 specified by @code{vc-diff-switches}, plus those specified for the
1812 specific back end by @code{vc-@var{backend}-diff-switches}. For
1813 instance, when the version control back end is RCS, @code{diff} uses
1814 the options in @code{vc-rcs-diff-switches}. The
1815 @samp{vc@dots{}diff-switches} variables are @code{nil} by default.
1816
1817 The buffer produced by @kbd{C-x v =} supports the commands of
1818 Compilation mode (@pxref{Compilation Mode}), such as @kbd{C-x `} and
1819 @kbd{C-c C-c}, in both the ``old'' and ``new'' text, and they always
1820 find the corresponding locations in the current work file. (Older
1821 versions are not, in general, present as files on your disk.)
1822
1823 @findex vc-annotate
1824 @kindex C-x v g
1825 For some back ends, you can display the file @dfn{annotated} with
1826 per-line version information and using colors to enhance the visual
1827 appearance, with the command @kbd{M-x vc-annotate}. It creates a new
1828 buffer (the ``annotate buffer'') displaying the file's text, with each
1829 part colored to show how old it is. Text colored red is new, blue means
1830 old, and intermediate colors indicate intermediate ages. By default,
1831 the color is scaled over the full range of ages, such that the oldest
1832 changes are blue, and the newest changes are red.
1833
1834 When you give a prefix argument to this command, it uses the
1835 minibuffer to read two arguments: which version number to display and
1836 annotate (instead of the current file contents), and the time span in
1837 days the color range should cover.
1838
1839 From the annotate buffer, these and other color scaling options are
1840 available from the @samp{VC-Annotate} menu. In this buffer, you can
1841 also use the following keys to browse the annotations of past revisions,
1842 view diffs, or view log entries:
1843
1844 @table @kbd
1845 @item P
1846 Annotate the previous revision, that is to say, the revision before
1847 the one currently annotated. A numeric prefix argument is a repeat
1848 count, so @kbd{C-u 10 P} would take you back 10 revisions.
1849
1850 @item N
1851 Annotate the next revision---the one after the revision currently
1852 annotated. A numeric prefix argument is a repeat count.
1853
1854 @item J
1855 Annotate the revision indicated by the current line.
1856
1857 @item A
1858 Annotate the revision before the one indicated by the current line.
1859 This is useful to see the state the file was in before the change on
1860 the current line was made.
1861
1862 @item D
1863 Display the diff between the current line's revision and the previous
1864 revision. This is useful to see what the current line's revision
1865 actually changed in the file.
1866
1867 @item L
1868 Show the log of the current line's revision. This is useful to see
1869 the author's description of the changes in the revision on the current
1870 line.
1871
1872 @item W
1873 Annotate the workfile version--the one you are editing. If you used
1874 @kbd{P} and @kbd{N} to browse to other revisions, use this key to
1875 return to your current version.
1876 @end table
1877
1878 @node Secondary VC Commands
1879 @subsection The Secondary Commands of VC
1880
1881 This section explains the secondary commands of VC; those that you might
1882 use once a day.
1883
1884 @menu
1885 * Registering:: Putting a file under version control.
1886 * VC Status:: Viewing the VC status of files.
1887 * VC Undo:: Canceling changes before or after check-in.
1888 @ifnottex
1889 * VC Dired Mode:: Listing files managed by version control.
1890 * VC Dired Commands:: Commands to use in a VC Dired buffer.
1891 @end ifnottex
1892 @end menu
1893
1894 @node Registering
1895 @subsubsection Registering a File for Version Control
1896
1897 @kindex C-x v i
1898 @findex vc-register
1899 You can put any file under version control by simply visiting it, and
1900 then typing @w{@kbd{C-x v i}} (@code{vc-register}).
1901
1902 @table @kbd
1903 @item C-x v i
1904 Register the visited file for version control.
1905 @end table
1906
1907 To register the file, Emacs must choose which version control system
1908 to use for it. If the file's directory already contains files
1909 registered in a version control system, Emacs uses that system. If
1910 there is more than one system in use for a directory, Emacs uses the
1911 one that appears first in @code{vc-handled-backends}
1912 @iftex
1913 (@pxref{Customizing VC,,,emacs-xtra, Specialized Emacs Features}).
1914 @end iftex
1915 @ifnottex
1916 (@pxref{Customizing VC}).
1917 @end ifnottex
1918 On the other hand, if there are no files already registered, Emacs uses
1919 the first system from @code{vc-handled-backends} that could register
1920 the file (for example, you cannot register a file under CVS if its
1921 directory is not already part of a CVS tree); with the default value
1922 of @code{vc-handled-backends}, this means that Emacs uses RCS in this
1923 situation.
1924
1925 If locking is in use, @kbd{C-x v i} leaves the file unlocked and
1926 read-only. Type @kbd{C-x v v} if you wish to start editing it. After
1927 registering a file with CVS, you must subsequently commit the initial
1928 version by typing @kbd{C-x v v}. Until you do that, the version
1929 appears as @samp{@@@@} in the mode line.
1930
1931 @vindex vc-default-init-version
1932 @cindex initial version number to register
1933 The initial version number for a newly registered file is 1.1, by
1934 default. You can specify a different default by setting the variable
1935 @code{vc-default-init-version}, or you can give @kbd{C-x v i} a numeric
1936 argument; then it reads the initial version number for this particular
1937 file using the minibuffer.
1938
1939 @vindex vc-initial-comment
1940 If @code{vc-initial-comment} is non-@code{nil}, @kbd{C-x v i} reads an
1941 initial comment to describe the purpose of this source file. Reading
1942 the initial comment works like reading a log entry (@pxref{Log Buffer}).
1943
1944 @node VC Status
1945 @subsubsection VC Status Commands
1946
1947 @table @kbd
1948 @item C-x v l
1949 Display version control state and change history.
1950 @end table
1951
1952 @kindex C-x v l
1953 @findex vc-print-log
1954 To view the detailed version control status and history of a file,
1955 type @kbd{C-x v l} (@code{vc-print-log}). It displays the history of
1956 changes to the current file, including the text of the log entries. The
1957 output appears in a separate window. The point is centered at the
1958 revision of the file that is currently being visited.
1959
1960 In the change log buffer, you can use the following keys to move
1961 between the logs of revisions and of files, to view past revisions, and
1962 to view diffs:
1963
1964 @table @kbd
1965 @item p
1966 Move to the previous revision-item in the buffer. (Revision entries in the log
1967 buffer are usually in reverse-chronological order, so the previous
1968 revision-item usually corresponds to a newer revision.) A numeric
1969 prefix argument is a repeat count.
1970
1971 @item n
1972 Move to the next revision-item (which most often corresponds to the
1973 previous revision of the file). A numeric prefix argument is a repeat
1974 count.
1975
1976 @item P
1977 Move to the log of the previous file, when the logs of multiple files
1978 are in the log buffer
1979 @iftex
1980 (@pxref{VC Dired Mode,,,emacs-xtra, Specialized Emacs Features}).
1981 @end iftex
1982 @ifnottex
1983 (@pxref{VC Dired Mode}).
1984 @end ifnottex
1985 Otherwise, just move to the beginning of the log. A numeric prefix
1986 argument is a repeat count, so @kbd{C-u 10 P} would move backward 10
1987 files.
1988
1989 @item N
1990 Move to the log of the next file, when the logs of multiple files are
1991 in the log buffer
1992 @iftex
1993 (@pxref{VC Dired Mode,,,emacs-xtra, Specialized Emacs Features}).
1994 @end iftex
1995 @ifnottex
1996 (@pxref{VC Dired Mode}).
1997 @end ifnottex
1998 It also takes a numeric prefix argument as a repeat count.
1999
2000 @item f
2001 Visit the revision indicated at the current line, like typing @kbd{C-x
2002 v ~} and specifying this revision's number (@pxref{Old Versions}).
2003
2004 @item d
2005 Display the diff (@pxref{Comparing Files}) between the revision
2006 indicated at the current line and the next earlier revision. This is
2007 useful to see what actually changed when the revision indicated on the
2008 current line was committed.
2009 @end table
2010
2011 @node VC Undo
2012 @subsubsection Undoing Version Control Actions
2013
2014 @table @kbd
2015 @item C-x v u
2016 Revert the buffer and the file to the version from which you started
2017 editing the file.
2018
2019 @item C-x v c
2020 Remove the last-entered change from the master for the visited file.
2021 This undoes your last check-in.
2022 @end table
2023
2024 @kindex C-x v u
2025 @findex vc-revert-buffer
2026 If you want to discard your current set of changes and revert to the
2027 version from which you started editing the file, use @kbd{C-x v u}
2028 (@code{vc-revert-buffer}). This leaves the file unlocked; if locking
2029 is in use, you must first lock the file again before you change it
2030 again. @kbd{C-x v u} requires confirmation, unless it sees that you
2031 haven't made any changes with respect to the master version.
2032
2033 @kbd{C-x v u} is also the command to unlock a file if you lock it and
2034 then decide not to change it.
2035
2036 @kindex C-x v c
2037 @findex vc-cancel-version
2038 To cancel a change that you already checked in, use @kbd{C-x v c}
2039 (@code{vc-cancel-version}). This command discards all record of the
2040 most recent checked-in version, but only if your work file corresponds
2041 to that version---you cannot use @kbd{C-x v c} to cancel a version
2042 that is not the latest on its branch. @kbd{C-x v c} also offers to
2043 revert your work file and buffer to the previous version (the one that
2044 precedes the version that is deleted).
2045
2046 If you answer @kbd{no}, VC keeps your changes in the buffer, and locks
2047 the file. The no-revert option is useful when you have checked in a
2048 change and then discover a trivial error in it; you can cancel the
2049 erroneous check-in, fix the error, and check the file in again.
2050
2051 When @kbd{C-x v c} does not revert the buffer, it unexpands all
2052 version control headers in the buffer instead
2053 @iftex
2054 (@pxref{Version Headers,,,emacs-xtra, Specialized Emacs Features}).
2055 @end iftex
2056 @ifnottex
2057 (@pxref{Version Headers}).
2058 @end ifnottex
2059 This is because the buffer no longer corresponds to any existing
2060 version. If you check it in again, the check-in process will expand
2061 the headers properly for the new version number.
2062
2063 However, it is impossible to unexpand the RCS @samp{@w{$}Log$} header
2064 automatically. If you use that header feature, you have to unexpand it
2065 by hand---by deleting the entry for the version that you just canceled.
2066
2067 Be careful when invoking @kbd{C-x v c}, as it is easy to lose a lot of
2068 work with it. To help you be careful, this command always requires
2069 confirmation with @kbd{yes}. Note also that this command is disabled
2070 under CVS, because canceling versions is very dangerous and discouraged
2071 with CVS.
2072
2073 @ifnottex
2074 @c vc1-xtra.texi needs extra level of lowering.
2075 @lowersections
2076 @include vc1-xtra.texi
2077 @raisesections
2078 @end ifnottex
2079
2080 @node Branches
2081 @subsection Multiple Branches of a File
2082 @cindex branch (version control)
2083 @cindex trunk (version control)
2084
2085 One use of version control is to maintain multiple ``current''
2086 versions of a file. For example, you might have different versions of a
2087 program in which you are gradually adding various unfinished new
2088 features. Each such independent line of development is called a
2089 @dfn{branch}. VC allows you to create branches, switch between
2090 different branches, and merge changes from one branch to another.
2091 Please note, however, that branches are not supported for SCCS.
2092
2093 A file's main line of development is usually called the @dfn{trunk}.
2094 The versions on the trunk are normally numbered 1.1, 1.2, 1.3, etc. At
2095 any such version, you can start an independent branch. A branch
2096 starting at version 1.2 would have version number 1.2.1.1, and consecutive
2097 versions on this branch would have numbers 1.2.1.2, 1.2.1.3, 1.2.1.4,
2098 and so on. If there is a second branch also starting at version 1.2, it
2099 would consist of versions 1.2.2.1, 1.2.2.2, 1.2.2.3, etc.
2100
2101 @cindex head version
2102 If you omit the final component of a version number, that is called a
2103 @dfn{branch number}. It refers to the highest existing version on that
2104 branch---the @dfn{head version} of that branch. The branches in the
2105 example above have branch numbers 1.2.1 and 1.2.2.
2106
2107 @menu
2108 * Switching Branches:: How to get to another existing branch.
2109 * Creating Branches:: How to start a new branch.
2110 * Merging:: Transferring changes between branches.
2111 * Multi-User Branching:: Multiple users working at multiple branches
2112 in parallel.
2113 @end menu
2114
2115 @node Switching Branches
2116 @subsubsection Switching between Branches
2117
2118 To switch between branches, type @kbd{C-u C-x v v} and specify the
2119 version number you want to select. This version is then visited
2120 @emph{unlocked} (write-protected), so you can examine it before locking
2121 it. Switching branches in this way is allowed only when the file is not
2122 locked.
2123
2124 You can omit the minor version number, thus giving only the branch
2125 number; this takes you to the head version on the chosen branch. If you
2126 only type @key{RET}, Emacs goes to the highest version on the trunk.
2127
2128 After you have switched to any branch (including the main branch), you
2129 stay on it for subsequent VC commands, until you explicitly select some
2130 other branch.
2131
2132 @node Creating Branches
2133 @subsubsection Creating New Branches
2134
2135 To create a new branch from a head version (one that is the latest in
2136 the branch that contains it), first select that version if necessary,
2137 lock it with @kbd{C-x v v}, and make whatever changes you want. Then,
2138 when you check in the changes, use @kbd{C-u C-x v v}. This lets you
2139 specify the version number for the new version. You should specify a
2140 suitable branch number for a branch starting at the current version.
2141 For example, if the current version is 2.5, the branch number should be
2142 2.5.1, 2.5.2, and so on, depending on the number of existing branches at
2143 that point.
2144
2145 To create a new branch at an older version (one that is no longer the
2146 head of a branch), first select that version (@pxref{Switching
2147 Branches}), then lock it with @kbd{C-x v v}. You'll be asked to
2148 confirm, when you lock the old version, that you really mean to create a
2149 new branch---if you say no, you'll be offered a chance to lock the
2150 latest version instead.
2151
2152 Then make your changes and type @kbd{C-x v v} again to check in a new
2153 version. This automatically creates a new branch starting from the
2154 selected version. You need not specially request a new branch, because
2155 that's the only way to add a new version at a point that is not the head
2156 of a branch.
2157
2158 After the branch is created, you ``stay'' on it. That means that
2159 subsequent check-ins create new versions on that branch. To leave the
2160 branch, you must explicitly select a different version with @kbd{C-u C-x
2161 v v}. To transfer changes from one branch to another, use the merge
2162 command, described in the next section.
2163
2164 @node Merging
2165 @subsubsection Merging Branches
2166
2167 @cindex merging changes
2168 When you have finished the changes on a certain branch, you will
2169 often want to incorporate them into the file's main line of development
2170 (the trunk). This is not a trivial operation, because development might
2171 also have proceeded on the trunk, so that you must @dfn{merge} the
2172 changes into a file that has already been changed otherwise. VC allows
2173 you to do this (and other things) with the @code{vc-merge} command.
2174
2175 @table @kbd
2176 @item C-x v m (vc-merge)
2177 Merge changes into the work file.
2178 @end table
2179
2180 @kindex C-x v m
2181 @findex vc-merge
2182 @kbd{C-x v m} (@code{vc-merge}) takes a set of changes and merges it
2183 into the current version of the work file. It firsts asks you in the
2184 minibuffer where the changes should come from. If you just type
2185 @key{RET}, Emacs merges any changes that were made on the same branch
2186 since you checked the file out (we call this @dfn{merging the news}).
2187 This is the common way to pick up recent changes from the repository,
2188 regardless of whether you have already changed the file yourself.
2189
2190 You can also enter a branch number or a pair of version numbers in
2191 the minibuffer. Then @kbd{C-x v m} finds the changes from that
2192 branch, or the differences between the two versions you specified, and
2193 merges them into the current version of the current file.
2194
2195 As an example, suppose that you have finished a certain feature on
2196 branch 1.3.1. In the meantime, development on the trunk has proceeded
2197 to version 1.5. To merge the changes from the branch to the trunk,
2198 first go to the head version of the trunk, by typing @kbd{C-u C-x v v
2199 @key{RET}}. Version 1.5 is now current. If locking is used for the file,
2200 type @kbd{C-x v v} to lock version 1.5 so that you can change it. Next,
2201 type @kbd{C-x v m 1.3.1 @key{RET}}. This takes the entire set of changes on
2202 branch 1.3.1 (relative to version 1.3, where the branch started, up to
2203 the last version on the branch) and merges it into the current version
2204 of the work file. You can now check in the changed file, thus creating
2205 version 1.6 containing the changes from the branch.
2206
2207 It is possible to do further editing after merging the branch, before
2208 the next check-in. But it is usually wiser to check in the merged
2209 version, then lock it and make the further changes. This will keep
2210 a better record of the history of changes.
2211
2212 @cindex conflicts
2213 @cindex resolving conflicts
2214 When you merge changes into a file that has itself been modified, the
2215 changes might overlap. We call this situation a @dfn{conflict}, and
2216 reconciling the conflicting changes is called @dfn{resolving a
2217 conflict}.
2218
2219 Whenever conflicts occur during merging, VC detects them, tells you
2220 about them in the echo area, and asks whether you want help in merging.
2221 If you say yes, it starts an Ediff session (@pxref{Top,
2222 Ediff, Ediff, ediff, The Ediff Manual}).
2223
2224 If you say no, the conflicting changes are both inserted into the
2225 file, surrounded by @dfn{conflict markers}. The example below shows how
2226 a conflict region looks; the file is called @samp{name} and the current
2227 master file version with user B's changes in it is 1.11.
2228
2229 @c @w here is so CVS won't think this is a conflict.
2230 @smallexample
2231 @group
2232 @w{<}<<<<<< name
2233 @var{User A's version}
2234 =======
2235 @var{User B's version}
2236 @w{>}>>>>>> 1.11
2237 @end group
2238 @end smallexample
2239
2240 @cindex vc-resolve-conflicts
2241 Then you can resolve the conflicts by editing the file manually. Or
2242 you can type @code{M-x vc-resolve-conflicts} after visiting the file.
2243 This starts an Ediff session, as described above. Don't forget to
2244 check in the merged version afterwards.
2245
2246 @node Multi-User Branching
2247 @subsubsection Multi-User Branching
2248
2249 It is often useful for multiple developers to work simultaneously on
2250 different branches of a file. CVS allows this by default; for RCS, it
2251 is possible if you create multiple source directories. Each source
2252 directory should have a link named @file{RCS} which points to a common
2253 directory of RCS master files. Then each source directory can have its
2254 own choice of selected versions, but all share the same common RCS
2255 records.
2256
2257 This technique works reliably and automatically, provided that the
2258 source files contain RCS version headers
2259 @iftex
2260 (@pxref{Version Headers,,,emacs-xtra, Specialized Emacs Features}).
2261 @end iftex
2262 @ifnottex
2263 (@pxref{Version Headers}).
2264 @end ifnottex
2265 The headers enable Emacs to be sure, at all times, which version
2266 number is present in the work file.
2267
2268 If the files do not have version headers, you must instead tell Emacs
2269 explicitly in each session which branch you are working on. To do this,
2270 first find the file, then type @kbd{C-u C-x v v} and specify the correct
2271 branch number. This ensures that Emacs knows which branch it is using
2272 during this particular editing session.
2273
2274 @ifnottex
2275 @include vc2-xtra.texi
2276 @end ifnottex
2277
2278 @node Directories
2279 @section File Directories
2280
2281 @cindex file directory
2282 @cindex directory listing
2283 The file system groups files into @dfn{directories}. A @dfn{directory
2284 listing} is a list of all the files in a directory. Emacs provides
2285 commands to create and delete directories, and to make directory
2286 listings in brief format (file names only) and verbose format (sizes,
2287 dates, and authors included). Emacs also includes a directory browser
2288 feature called Dired; see @ref{Dired}.
2289
2290 @table @kbd
2291 @item C-x C-d @var{dir-or-pattern} @key{RET}
2292 Display a brief directory listing (@code{list-directory}).
2293 @item C-u C-x C-d @var{dir-or-pattern} @key{RET}
2294 Display a verbose directory listing.
2295 @item M-x make-directory @key{RET} @var{dirname} @key{RET}
2296 Create a new directory named @var{dirname}.
2297 @item M-x delete-directory @key{RET} @var{dirname} @key{RET}
2298 Delete the directory named @var{dirname}. It must be empty,
2299 or you get an error.
2300 @end table
2301
2302 @findex list-directory
2303 @kindex C-x C-d
2304 The command to display a directory listing is @kbd{C-x C-d}
2305 (@code{list-directory}). It reads using the minibuffer a file name
2306 which is either a directory to be listed or a wildcard-containing
2307 pattern for the files to be listed. For example,
2308
2309 @example
2310 C-x C-d /u2/emacs/etc @key{RET}
2311 @end example
2312
2313 @noindent
2314 lists all the files in directory @file{/u2/emacs/etc}. Here is an
2315 example of specifying a file name pattern:
2316
2317 @example
2318 C-x C-d /u2/emacs/src/*.c @key{RET}
2319 @end example
2320
2321 Normally, @kbd{C-x C-d} displays a brief directory listing containing
2322 just file names. A numeric argument (regardless of value) tells it to
2323 make a verbose listing including sizes, dates, and owners (like
2324 @samp{ls -l}).
2325
2326 @vindex list-directory-brief-switches
2327 @vindex list-directory-verbose-switches
2328 The text of a directory listing is mostly obtained by running
2329 @code{ls} in an inferior process. Two Emacs variables control the
2330 switches passed to @code{ls}: @code{list-directory-brief-switches} is
2331 a string giving the switches to use in brief listings (@code{"-CF"} by
2332 default), and @code{list-directory-verbose-switches} is a string
2333 giving the switches to use in a verbose listing (@code{"-l"} by
2334 default).
2335
2336 @vindex directory-free-space-program
2337 @vindex directory-free-space-args
2338 In verbose directory listings, Emacs adds information about the
2339 amount of free space on the disk that contains the directory. To do
2340 this, it runs the program specified by
2341 @code{directory-free-space-program} with arguments
2342 @code{directory-free-space-args}.
2343
2344 @node Comparing Files
2345 @section Comparing Files
2346 @cindex comparing files
2347
2348 @findex diff
2349 @vindex diff-switches
2350 The command @kbd{M-x diff} compares two files, displaying the
2351 differences in an Emacs buffer named @samp{*diff*}. It works by
2352 running the @code{diff} program, using options taken from the variable
2353 @code{diff-switches}. The value of @code{diff-switches} should be a
2354 string; the default is @code{"-c"} to specify a context diff.
2355 @xref{Top,, Diff, diff, Comparing and Merging Files}, for more
2356 information about @command{diff} output formats.
2357
2358 @findex diff-backup
2359 The command @kbd{M-x diff-backup} compares a specified file with its most
2360 recent backup. If you specify the name of a backup file,
2361 @code{diff-backup} compares it with the source file that it is a backup
2362 of.
2363
2364 @findex compare-windows
2365 The command @kbd{M-x compare-windows} compares the text in the
2366 current window with that in the next window. (For more information
2367 about windows in Emacs, @ref{Windows}.) Comparison starts at point in
2368 each window, after pushing each initial point value on the mark ring
2369 in its respective buffer. Then it moves point forward in each window,
2370 one character at a time, until it reaches characters that don't match.
2371 Then the command exits.
2372
2373 If point in the two windows is followed by non-matching text when
2374 the command starts, @kbd{M-x compare-windows} tries heuristically to
2375 advance up to matching text in the two windows, and then exits. So if
2376 you use @kbd{M-x compare-windows} repeatedly, each time it either
2377 skips one matching range or finds the start of another.
2378
2379 @vindex compare-ignore-case
2380 @vindex compare-ignore-whitespace
2381 With a numeric argument, @code{compare-windows} ignores changes in
2382 whitespace. If the variable @code{compare-ignore-case} is
2383 non-@code{nil}, the comparison ignores differences in case as well.
2384 If the variable @code{compare-ignore-whitespace} is non-@code{nil},
2385 @code{compare-windows} normally ignores changes in whitespace, and a
2386 prefix argument turns that off.
2387
2388 @cindex Smerge mode
2389 @findex smerge-mode
2390 @cindex failed merges
2391 @cindex merges, failed
2392 @cindex comparing 3 files (@code{diff3})
2393 You can use @kbd{M-x smerge-mode} to turn on Smerge mode, a minor
2394 mode for editing output from the @command{diff3} program. This is
2395 typically the result of a failed merge from a version control system
2396 ``update'' outside VC, due to conflicting changes to a file. Smerge
2397 mode provides commands to resolve conflicts by selecting specific
2398 changes.
2399
2400 @iftex
2401 @xref{Emerge,,, emacs-xtra, Specialized Emacs Features},
2402 @end iftex
2403 @ifnottex
2404 @xref{Emerge},
2405 @end ifnottex
2406 for the Emerge facility, which provides a powerful interface for
2407 merging files.
2408
2409 @node Diff Mode
2410 @section Diff Mode
2411 @cindex Diff mode
2412 @findex diff-mode
2413 @cindex patches, editing
2414
2415 Diff mode is used for the output of @kbd{M-x diff}; it is also
2416 useful for editing patches and comparisons produced by the
2417 @command{diff} program. To select Diff mode manually, type @kbd{M-x
2418 diff-mode}.
2419
2420 One general feature of Diff mode is that manual edits to the patch
2421 automatically correct line numbers, including those in the hunk
2422 header, so that you can actually apply the edited patch. Diff mode
2423 treats each hunk location as an ``error message,'' so that you can use
2424 commands such as @kbd{C-x '} to visit the corresponding source
2425 locations. It also provides the following commands to navigate,
2426 manipulate and apply parts of patches:
2427
2428 @table @kbd
2429 @item M-n
2430 Move to the next hunk-start (@code{diff-hunk-next}).
2431
2432 @item M-p
2433 Move to the previous hunk-start (@code{diff-hunk-prev}).
2434
2435 @item M-@}
2436 Move to the next file-start, in a multi-file patch
2437 (@code{diff-file-next}).
2438
2439 @item M-@{
2440 Move to the previous file-start, in a multi-file patch
2441 (@code{diff-file-prev}).
2442
2443 @item M-k
2444 Kill the hunk at point (@code{diff-hunk-kill}).
2445
2446 @item M-K
2447 In a multi-file patch, kill the current file part.
2448 (@code{diff-file-kill}).
2449
2450 @item C-c C-a
2451 Apply this hunk to its target file (@code{diff-apply-hunk}). With a
2452 prefix argument of @kbd{C-u}, revert this hunk.
2453
2454 @item C-c C-c
2455 Go to the source corresponding to this hunk (@code{diff-goto-source}).
2456
2457 @item C-c C-e
2458 Start an Ediff session with the patch (@code{diff-ediff-patch}).
2459 @xref{Top, Ediff, Ediff, ediff, The Ediff Manual}.
2460
2461 @item C-c C-n
2462 Restrict the view to the current hunk (@code{diff-restrict-view}).
2463 @xref{Narrowing}. With a prefix argument of @kbd{C-u}, restrict the
2464 view to the current patch of a multiple file patch. To widen again,
2465 use @kbd{C-x n w}.
2466
2467 @item C-c C-r
2468 Reverse the direction of comparison for the entire buffer
2469 (@code{diff-reverse-direction}).
2470
2471 @item C-c C-s
2472 Split the hunk at point (@code{diff-split-hunk}). This is for
2473 manually editing patches, and only works with the unified diff format.
2474
2475 @item C-c C-u
2476 Convert the entire buffer to unified format
2477 (@code{diff-context->unified}). With a prefix argument, convert
2478 unified format to context format. In Transient Mark mode, when the
2479 mark is active, this command operates only on the region.
2480
2481 @item C-c C-w
2482 Refine the current hunk so that it disregards changes in whitespace
2483 (@code{diff-refine-hunk}).
2484 @end table
2485
2486 @kbd{C-x 4 a} in Diff mode operates on behalf of the target file,
2487 but gets the function name from the patch itself. @xref{Change Log}.
2488 This is useful for making log entries for functions that are deleted
2489 by the patch.
2490
2491 @node Misc File Ops
2492 @section Miscellaneous File Operations
2493
2494 Emacs has commands for performing many other operations on files.
2495 All operate on one file; they do not accept wildcard file names.
2496
2497 @findex view-file
2498 @cindex viewing
2499 @cindex View mode
2500 @cindex mode, View
2501 @kbd{M-x view-file} allows you to scan or read a file by sequential
2502 screenfuls. It reads a file name argument using the minibuffer. After
2503 reading the file into an Emacs buffer, @code{view-file} displays the
2504 beginning. You can then type @key{SPC} to scroll forward one windowful,
2505 or @key{DEL} to scroll backward. Various other commands are provided
2506 for moving around in the file, but none for changing it; type @kbd{?}
2507 while viewing for a list of them. They are mostly the same as normal
2508 Emacs cursor motion commands. To exit from viewing, type @kbd{q}.
2509 The commands for viewing are defined by a special minor mode called View
2510 mode.
2511
2512 A related command, @kbd{M-x view-buffer}, views a buffer already present
2513 in Emacs. @xref{Misc Buffer}.
2514
2515 @kindex C-x i
2516 @findex insert-file
2517 @kbd{M-x insert-file} (also @kbd{C-x i}) inserts a copy of the
2518 contents of the specified file into the current buffer at point,
2519 leaving point unchanged before the contents and the mark after them.
2520
2521 @findex insert-file-literally
2522 @kbd{M-x insert-file-literally} is like @kbd{M-x insert-file},
2523 except the file is inserted ``literally'': it is treated as a sequence
2524 of @acronym{ASCII} characters with no special encoding or conversion,
2525 similar to the @kbd{M-x find-file-literally} command
2526 (@pxref{Visiting}).
2527
2528 @findex write-region
2529 @kbd{M-x write-region} is the inverse of @kbd{M-x insert-file}; it
2530 copies the contents of the region into the specified file. @kbd{M-x
2531 append-to-file} adds the text of the region to the end of the
2532 specified file. @xref{Accumulating Text}. The variable
2533 @code{write-region-inhibit-fsync} applies to these commands, as well
2534 as saving files; see @ref{Customize Save}.
2535
2536 @findex delete-file
2537 @cindex deletion (of files)
2538 @kbd{M-x delete-file} deletes the specified file, like the @code{rm}
2539 command in the shell. If you are deleting many files in one directory, it
2540 may be more convenient to use Dired (@pxref{Dired}).
2541
2542 @findex rename-file
2543 @kbd{M-x rename-file} reads two file names @var{old} and @var{new} using
2544 the minibuffer, then renames file @var{old} as @var{new}. If the file name
2545 @var{new} already exists, you must confirm with @kbd{yes} or renaming is not
2546 done; this is because renaming causes the old meaning of the name @var{new}
2547 to be lost. If @var{old} and @var{new} are on different file systems, the
2548 file @var{old} is copied and deleted.
2549
2550 If the argument @var{new} is just a directory name, the real new
2551 name is in that directory, with the same non-directory component as
2552 @var{old}. For example, @kbd{M-x rename-file RET ~/foo RET /tmp RET}
2553 renames @file{~/foo} to @file{/tmp/foo}. The same rule applies to all
2554 the remaining commands in this section. All of them ask for
2555 confirmation when the new file name already exists, too.
2556
2557 @findex add-name-to-file
2558 @cindex hard links (creation)
2559 The similar command @kbd{M-x add-name-to-file} is used to add an
2560 additional name to an existing file without removing its old name.
2561 The new name is created as a ``hard link'' to the existing file.
2562 The new name must belong on the same file system that the file is on.
2563 On MS-Windows, this command works only if the file resides in an NTFS
2564 file system. On MS-DOS, it works by copying the file.
2565
2566 @findex copy-file
2567 @cindex copying files
2568 @kbd{M-x copy-file} reads the file @var{old} and writes a new file
2569 named @var{new} with the same contents.
2570
2571 @findex make-symbolic-link
2572 @cindex symbolic links (creation)
2573 @kbd{M-x make-symbolic-link} reads two file names @var{target} and
2574 @var{linkname}, then creates a symbolic link named @var{linkname},
2575 which points at @var{target}. The effect is that future attempts to
2576 open file @var{linkname} will refer to whatever file is named
2577 @var{target} at the time the opening is done, or will get an error if
2578 the name @var{target} is nonexistent at that time. This command does
2579 not expand the argument @var{target}, so that it allows you to specify
2580 a relative name as the target of the link.
2581
2582 Not all systems support symbolic links; on systems that don't
2583 support them, this command is not defined.
2584
2585 @node Compressed Files
2586 @section Accessing Compressed Files
2587 @cindex compression
2588 @cindex uncompression
2589 @cindex Auto Compression mode
2590 @cindex mode, Auto Compression
2591 @pindex gzip
2592
2593 Emacs automatically uncompresses compressed files when you visit
2594 them, and automatically recompresses them if you alter them and save
2595 them. Emacs recognizes compressed files by their file names. File
2596 names ending in @samp{.gz} indicate a file compressed with
2597 @code{gzip}. Other endings indicate other compression programs.
2598
2599 Automatic uncompression and compression apply to all the operations in
2600 which Emacs uses the contents of a file. This includes visiting it,
2601 saving it, inserting its contents into a buffer, loading it, and byte
2602 compiling it.
2603
2604 @findex auto-compression-mode
2605 @vindex auto-compression-mode
2606 To disable this feature, type the command @kbd{M-x
2607 auto-compression-mode}. You can disable it permanently by
2608 customizing the variable @code{auto-compression-mode}.
2609
2610 @node File Archives
2611 @section File Archives
2612 @cindex mode, tar
2613 @cindex Tar mode
2614 @cindex file archives
2615
2616 A file whose name ends in @samp{.tar} is normally an @dfn{archive}
2617 made by the @code{tar} program. Emacs views these files in a special
2618 mode called Tar mode which provides a Dired-like list of the contents
2619 (@pxref{Dired}). You can move around through the list just as you
2620 would in Dired, and visit the subfiles contained in the archive.
2621 However, not all Dired commands are available in Tar mode.
2622
2623 If Auto Compression mode is enabled (@pxref{Compressed Files}), then
2624 Tar mode is used also for compressed archives---files with extensions
2625 @samp{.tgz}, @code{.tar.Z} and @code{.tar.gz}.
2626
2627 The keys @kbd{e}, @kbd{f} and @key{RET} all extract a component file
2628 into its own buffer. You can edit it there, and if you save the
2629 buffer, the edited version will replace the version in the Tar buffer.
2630 @kbd{v} extracts a file into a buffer in View mode. @kbd{o} extracts
2631 the file and displays it in another window, so you could edit the file
2632 and operate on the archive simultaneously. @kbd{d} marks a file for
2633 deletion when you later use @kbd{x}, and @kbd{u} unmarks a file, as in
2634 Dired. @kbd{C} copies a file from the archive to disk and @kbd{R}
2635 renames a file within the archive. @kbd{g} reverts the buffer from
2636 the archive on disk.
2637
2638 The keys @kbd{M}, @kbd{G}, and @kbd{O} change the file's permission
2639 bits, group, and owner, respectively.
2640
2641 If your display supports colors and the mouse, moving the mouse
2642 pointer across a file name highlights that file name, indicating that
2643 you can click on it. Clicking @kbd{Mouse-2} on the highlighted file
2644 name extracts the file into a buffer and displays that buffer.
2645
2646 Saving the Tar buffer writes a new version of the archive to disk with
2647 the changes you made to the components.
2648
2649 You don't need the @code{tar} program to use Tar mode---Emacs reads
2650 the archives directly. However, accessing compressed archives
2651 requires the appropriate uncompression program.
2652
2653 @cindex Archive mode
2654 @cindex mode, archive
2655 @cindex @code{arc}
2656 @cindex @code{jar}
2657 @cindex @code{zip}
2658 @cindex @code{lzh}
2659 @cindex @code{zoo}
2660 @pindex arc
2661 @pindex jar
2662 @pindex zip
2663 @pindex lzh
2664 @pindex zoo
2665 @cindex Java class archives
2666 @cindex unzip archives
2667 A separate but similar Archive mode is used for archives produced by
2668 the programs @code{arc}, @code{jar}, @code{lzh}, @code{zip}, and
2669 @code{zoo}, which have extensions corresponding to the program names.
2670 Archive mode also works for those @code{exe} files that are
2671 self-extracting executables.
2672
2673 The key bindings of Archive mode are similar to those in Tar mode,
2674 with the addition of the @kbd{m} key which marks a file for subsequent
2675 operations, and @kbd{M-@key{DEL}} which unmarks all the marked files.
2676 Also, the @kbd{a} key toggles the display of detailed file
2677 information, for those archive types where it won't fit in a single
2678 line. Operations such as renaming a subfile, or changing its mode or
2679 owner, are supported only for some of the archive formats.
2680
2681 Unlike Tar mode, Archive mode runs the archiving program to unpack
2682 and repack archives. Details of the program names and their options
2683 can be set in the @samp{Archive} Customize group. However, you don't
2684 need these programs to look at the archive table of contents, only to
2685 extract or manipulate the subfiles in the archive.
2686
2687 @node Remote Files
2688 @section Remote Files
2689
2690 @cindex Tramp
2691 @cindex FTP
2692 @cindex remote file access
2693 You can refer to files on other machines using a special file name
2694 syntax:
2695
2696 @example
2697 @group
2698 /@var{host}:@var{filename}
2699 /@var{user}@@@var{host}:@var{filename}
2700 /@var{user}@@@var{host}#@var{port}:@var{filename}
2701 /@var{method}:@var{user}@@@var{host}:@var{filename}
2702 /@var{method}:@var{user}@@@var{host}#@var{port}:@var{filename}
2703 @end group
2704 @end example
2705
2706 @noindent
2707 To carry out this request, Emacs uses either the FTP program or a
2708 remote-login program such as @command{ssh}, @command{rlogin}, or
2709 @command{telnet}. You can always specify in the file name which
2710 method to use---for example,
2711 @file{/ftp:@var{user}@@@var{host}:@var{filename}} uses FTP, whereas
2712 @file{/ssh:@var{user}@@@var{host}:@var{filename}} uses @command{ssh}.
2713 When you don't specify a method in the file name, Emacs chooses
2714 the method as follows:
2715
2716 @enumerate
2717 @item
2718 If the host name starts with @samp{ftp.} (with dot), then Emacs uses
2719 FTP.
2720 @item
2721 If the user name is @samp{ftp} or @samp{anonymous}, then Emacs uses
2722 FTP.
2723 @item
2724 Otherwise, Emacs uses @command{ssh}.
2725 @end enumerate
2726
2727 @noindent
2728 Remote file access through FTP is handled by the Ange-FTP package, which
2729 is documented in the following. Remote file access through the other
2730 methods is handled by the Tramp package, which has its own manual.
2731 @xref{Top, The Tramp Manual,, tramp, The Tramp Manual}.
2732
2733 When the Ange-FTP package is used, Emacs logs in through FTP using your
2734 user name or the name @var{user}. It may ask you for a password from
2735 time to time; this is used for logging in on @var{host}. The form using
2736 @var{port} allows you to access servers running on a non-default TCP
2737 port.
2738
2739 @cindex backups for remote files
2740 @vindex ange-ftp-make-backup-files
2741 If you want to disable backups for remote files, set the variable
2742 @code{ange-ftp-make-backup-files} to @code{nil}.
2743
2744 By default, the auto-save files (@pxref{Auto Save Files}) for remote
2745 files are made in the temporary file directory on the local machine.
2746 This is achieved using the variable @code{auto-save-file-name-transforms}.
2747
2748 @cindex ange-ftp
2749 @vindex ange-ftp-default-user
2750 @cindex user name for remote file access
2751 Normally, if you do not specify a user name in a remote file name,
2752 that means to use your own user name. But if you set the variable
2753 @code{ange-ftp-default-user} to a string, that string is used instead.
2754
2755 @cindex anonymous FTP
2756 @vindex ange-ftp-generate-anonymous-password
2757 To visit files accessible by anonymous FTP, you use special user
2758 names @samp{anonymous} or @samp{ftp}. Passwords for these user names
2759 are handled specially. The variable
2760 @code{ange-ftp-generate-anonymous-password} controls what happens: if
2761 the value of this variable is a string, then that string is used as
2762 the password; if non-@code{nil} (the default), then the value of
2763 @code{user-mail-address} is used; if @code{nil}, then Emacs prompts
2764 you for a password as usual.
2765
2766 @cindex firewall, and accessing remote files
2767 @cindex gateway, and remote file access with @code{ange-ftp}
2768 @vindex ange-ftp-smart-gateway
2769 @vindex ange-ftp-gateway-host
2770 Sometimes you may be unable to access files on a remote machine
2771 because a @dfn{firewall} in between blocks the connection for security
2772 reasons. If you can log in on a @dfn{gateway} machine from which the
2773 target files @emph{are} accessible, and whose FTP server supports
2774 gatewaying features, you can still use remote file names; all you have
2775 to do is specify the name of the gateway machine by setting the
2776 variable @code{ange-ftp-gateway-host}, and set
2777 @code{ange-ftp-smart-gateway} to @code{t}. Otherwise you may be able
2778 to make remote file names work, but the procedure is complex. You can
2779 read the instructions by typing @kbd{M-x finder-commentary @key{RET}
2780 ange-ftp @key{RET}}.
2781
2782 @vindex file-name-handler-alist
2783 @cindex disabling remote files
2784 You can entirely turn off the FTP file name feature by removing the
2785 entries @code{ange-ftp-completion-hook-function} and
2786 @code{ange-ftp-hook-function} from the variable
2787 @code{file-name-handler-alist}. You can turn off the feature in
2788 individual cases by quoting the file name with @samp{/:} (@pxref{Quoted
2789 File Names}).
2790
2791 @node Quoted File Names
2792 @section Quoted File Names
2793
2794 @cindex quoting file names
2795 @cindex file names, quote special characters
2796 You can @dfn{quote} an absolute file name to prevent special
2797 characters and syntax in it from having their special effects.
2798 The way to do this is to add @samp{/:} at the beginning.
2799
2800 For example, you can quote a local file name which appears remote, to
2801 prevent it from being treated as a remote file name. Thus, if you have
2802 a directory named @file{/foo:} and a file named @file{bar} in it, you
2803 can refer to that file in Emacs as @samp{/:/foo:/bar}.
2804
2805 @samp{/:} can also prevent @samp{~} from being treated as a special
2806 character for a user's home directory. For example, @file{/:/tmp/~hack}
2807 refers to a file whose name is @file{~hack} in directory @file{/tmp}.
2808
2809 Quoting with @samp{/:} is also a way to enter in the minibuffer a
2810 file name that contains @samp{$}. In order for this to work, the
2811 @samp{/:} must be at the beginning of the minibuffer contents. (You
2812 can also double each @samp{$}; see @ref{File Names with $}.)
2813
2814 You can also quote wildcard characters with @samp{/:}, for visiting.
2815 For example, @file{/:/tmp/foo*bar} visits the file
2816 @file{/tmp/foo*bar}.
2817
2818 Another method of getting the same result is to enter
2819 @file{/tmp/foo[*]bar}, which is a wildcard specification that matches
2820 only @file{/tmp/foo*bar}. However, in many cases there is no need to
2821 quote the wildcard characters because even unquoted they give the
2822 right result. For example, if the only file name in @file{/tmp} that
2823 starts with @samp{foo} and ends with @samp{bar} is @file{foo*bar},
2824 then specifying @file{/tmp/foo*bar} will visit only
2825 @file{/tmp/foo*bar}.
2826
2827 @node File Name Cache
2828 @section File Name Cache
2829
2830 @cindex file name caching
2831 @cindex cache of file names
2832 @pindex find
2833 @kindex C-@key{TAB}
2834 @findex file-cache-minibuffer-complete
2835 You can use the @dfn{file name cache} to make it easy to locate a
2836 file by name, without having to remember exactly where it is located.
2837 When typing a file name in the minibuffer, @kbd{C-@key{tab}}
2838 (@code{file-cache-minibuffer-complete}) completes it using the file
2839 name cache. If you repeat @kbd{C-@key{tab}}, that cycles through the
2840 possible completions of what you had originally typed. (However, note
2841 that the @kbd{C-@key{tab}} character cannot be typed on most text-only
2842 terminals.)
2843
2844 The file name cache does not fill up automatically. Instead, you
2845 load file names into the cache using these commands:
2846
2847 @findex file-cache-add-directory
2848 @table @kbd
2849 @item M-x file-cache-add-directory @key{RET} @var{directory} @key{RET}
2850 Add each file name in @var{directory} to the file name cache.
2851 @item M-x file-cache-add-directory-using-find @key{RET} @var{directory} @key{RET}
2852 Add each file name in @var{directory} and all of its nested
2853 subdirectories to the file name cache.
2854 @item M-x file-cache-add-directory-using-locate @key{RET} @var{directory} @key{RET}
2855 Add each file name in @var{directory} and all of its nested
2856 subdirectories to the file name cache, using @command{locate} to find
2857 them all.
2858 @item M-x file-cache-add-directory-list @key{RET} @var{variable} @key{RET}
2859 Add each file name in each directory listed in @var{variable}
2860 to the file name cache. @var{variable} should be a Lisp variable
2861 such as @code{load-path} or @code{exec-path}, whose value is a list
2862 of directory names.
2863 @item M-x file-cache-clear-cache @key{RET}
2864 Clear the cache; that is, remove all file names from it.
2865 @end table
2866
2867 The file name cache is not persistent: it is kept and maintained
2868 only for the duration of the Emacs session. You can view the contents
2869 of the cache with the @code{file-cache-display} command.
2870
2871 @node File Conveniences
2872 @section Convenience Features for Finding Files
2873
2874 In this section, we introduce some convenient facilities for finding
2875 recently-opened files, reading file names from a buffer, and viewing
2876 image files.
2877
2878 @findex recentf-mode
2879 @vindex recentf-mode
2880 @findex recentf-save-list
2881 @findex recentf-edit-list
2882 If you enable Recentf mode, with @kbd{M-x recentf-mode}, the
2883 @samp{File} menu includes a submenu containing a list of recently
2884 opened files. @kbd{M-x recentf-save-list} saves the current
2885 @code{recent-file-list} to a file, and @kbd{M-x recentf-edit-list}
2886 edits it.
2887
2888 The @kbd{M-x ffap} command generalizes @code{find-file} with more
2889 powerful heuristic defaults (@pxref{FFAP}), often based on the text at
2890 point. Partial Completion mode offers other features extending
2891 @code{find-file}, which can be used with @code{ffap}.
2892 @xref{Completion Options}.
2893
2894 @findex image-mode
2895 @findex image-toggle-display
2896 @cindex images, viewing
2897 Visiting image files automatically selects Image mode. This major
2898 mode allows you to toggle between displaying the file as an image in
2899 the Emacs buffer, and displaying its underlying text representation,
2900 using the command @kbd{C-c C-c} (@code{image-toggle-display}). This
2901 works only when Emacs can display the specific image type. If the
2902 displayed image is wider or taller than the frame, the usual point
2903 motion keys (@kbd{C-f}, @kbd{C-p}, and so forth) cause different parts
2904 of the image to be displayed.
2905
2906 @findex thumbs-mode
2907 @findex mode, thumbs
2908 See also the Image-Dired package (@pxref{Image-Dired}) for viewing
2909 images as thumbnails.
2910
2911 @node Filesets
2912 @section Filesets
2913 @cindex filesets
2914
2915 @findex filesets-init
2916 If you regularly edit a certain group of files, you can define them
2917 as a @dfn{fileset}. This lets you perform certain operations, such as
2918 visiting, @code{query-replace}, and shell commands on all the files
2919 at once. To make use of filesets, you must first add the expression
2920 @code{(filesets-init)} to your @file{.emacs} file (@pxref{Init File}).
2921 This adds a @samp{Filesets} menu to the menu bar.
2922
2923 @findex filesets-add-buffer
2924 @findex filesets-remove-buffer
2925 The simplest way to define a fileset is by adding files to it one
2926 at a time. To add a file to fileset @var{name}, visit the file and
2927 type @kbd{M-x filesets-add-buffer @kbd{RET} @var{name} @kbd{RET}}. If
2928 there is no fileset @var{name}, this creates a new one, which
2929 initially creates only the current file. The command @kbd{M-x
2930 filesets-remove-buffer} removes the current file from a fileset.
2931
2932 You can also edit the list of filesets directly, with @kbd{M-x
2933 filesets-edit} (or by choosing @samp{Edit Filesets} from the
2934 @samp{Filesets} menu). The editing is performed in a Customize buffer
2935 (@pxref{Easy Customization}). Filesets need not be a simple list of
2936 files---you can also define filesets using regular expression matching
2937 file names. Some examples of these more complicated filesets are
2938 shown in the Customize buffer. Remember to select @samp{Save for
2939 future sessions} if you want to use the same filesets in future Emacs
2940 sessions.
2941
2942 You can use the command @kbd{M-x filesets-open} to visit all the
2943 files in a fileset, and @kbd{M-x filesets-close} to close them. Use
2944 @kbd{M-x filesets-run-cmd} to run a shell command on all the files in
2945 a fileset. These commands are also available from the @samp{Filesets}
2946 menu, where each existing fileset is represented by a submenu.
2947
2948 @ignore
2949 arch-tag: 768d32cb-e15a-4cc1-b7bf-62c00ee12250
2950 @end ignore