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