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