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