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