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