aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2005-02-03 07:25:14 +0000
committerRichard M. Stallman2005-02-03 07:25:14 +0000
commit4a10556bc2baa2b6904536f65d27d85e29b03844 (patch)
tree56a2b384d903a1d3000cbcccc47ed92e60f3c88f
parentb027df6b5813b665a9fcdeb0d0017905daa5df4a (diff)
downloademacs-4a10556bc2baa2b6904536f65d27d85e29b03844.tar.gz
emacs-4a10556bc2baa2b6904536f65d27d85e29b03844.zip
(File Names): Clarify.
(Visiting): Update conditions for use of file dialog. Clarify. (Saving): Doc d as answer in save-some-buffers. (Remote Files): Clean up the text.
-rw-r--r--man/files.texi49
1 files changed, 26 insertions, 23 deletions
diff --git a/man/files.texi b/man/files.texi
index 2ab9d5aaaa6..df7809309e8 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -120,7 +120,7 @@ is not defined).
120only when done before Emacs is started. 120only when done before Emacs is started.
121 121
122@cindex home directory shorthand 122@cindex home directory shorthand
123 You can use the @file{~/} in a file name to mean your home directory, 123 You can use @file{~/} in a file name to mean your home directory,
124or @file{~@var{user-id}/} to mean the home directory of a user whose 124or @file{~@var{user-id}/} to mean the home directory of a user whose
125login name is @code{user-id}. (On DOS and Windows systems, where a user 125login name is @code{user-id}. (On DOS and Windows systems, where a user
126doesn't have a home directory, Emacs substitutes @file{~/} with the 126doesn't have a home directory, Emacs substitutes @file{~/} with the
@@ -208,11 +208,13 @@ While in the minibuffer, you can abort @kbd{C-x C-f} by typing
208about this, see @ref{Completion Options}. 208about this, see @ref{Completion Options}.
209 209
210@cindex file selection dialog 210@cindex file selection dialog
211 When Emacs is built with a suitable GUI toolkit, it pops up the 211 When Emacs is built with a suitable GUI toolkit, commands invoked
212standard File Selection dialog of that toolkit instead of prompting for 212with the mouse or the menu bar use the toolkit's standard File
213the file name in the minibuffer. On Unix and GNU/Linux platforms, Emacs 213Selection dialog instead of prompting for the file name in the
214does that when built with LessTif and Motif toolkits; on MS-Windows, the 214minibuffer. On Unix and GNU/Linux platforms, Emacs does that when
215GUI version does that by default. 215built with GTK, LessTif, and Motif toolkits; on MS-Windows, the GUI
216version does that by default. @xref{Dialog Boxes}, for info
217on customization of this.
216 218
217 Your confirmation that @kbd{C-x C-f} has completed successfully is the 219 Your confirmation that @kbd{C-x C-f} has completed successfully is the
218appearance of new text on the screen and a new buffer name in the mode 220appearance of new text on the screen and a new buffer name in the mode
@@ -253,10 +255,10 @@ carriage-return linefeed or just carriage-return if appropriate.
253@vindex find-file-run-dired 255@vindex find-file-run-dired
254 If the file you specify is actually a directory, @kbd{C-x C-f} invokes 256 If the file you specify is actually a directory, @kbd{C-x C-f} invokes
255Dired, the Emacs directory browser, so that you can ``edit'' the contents 257Dired, the Emacs directory browser, so that you can ``edit'' the contents
256of the directory (@pxref{Dired}). Dired is a convenient way to delete, 258of the directory (@pxref{Dired}). Dired is a convenient way to view, delete,
257look at, or operate on the files in the directory. However, if the 259or operate on the files in the directory. However, if the variable
258variable @code{find-file-run-dired} is @code{nil}, then it is an error 260@code{find-file-run-dired} is @code{nil}, then it is an error to try
259to try to visit a directory. 261to visit a directory.
260 262
261 Files which are actually collections of other files, or @dfn{file 263 Files which are actually collections of other files, or @dfn{file
262archives}, are visited in special modes which invoke a Dired-like 264archives}, are visited in special modes which invoke a Dired-like
@@ -407,6 +409,9 @@ about other buffers.
407View the buffer that you are currently being asked about. When you exit 409View the buffer that you are currently being asked about. When you exit
408View mode, you get back to @code{save-some-buffers}, which asks the 410View mode, you get back to @code{save-some-buffers}, which asks the
409question again. 411question again.
412@item d
413Diff the buffer against its corresponding file, so you can see
414what changes you would be saving.
410@item C-h 415@item C-h
411Display a help message about these options. 416Display a help message about these options.
412@end table 417@end table
@@ -3085,26 +3090,24 @@ syntax:
3085@end example 3090@end example
3086 3091
3087@noindent 3092@noindent
3088When you do this, Emacs may use the FTP program to access files on the 3093To carry out this request, Emacs uses either the FTP program or a
3089remote host, or Emacs may use a remote-login program (such as 3094remote-login program such as @command{ssh}, @command{rlogin}, or
3090@command{ssh}, @command{rlogin}, or @command{telnet}) to do this. 3095@command{telnet}. You can always specify in the file name which
3091 3096method to use---for example,
3092You can always specify in the file name which method should be used to
3093access the remote files, for example
3094@file{/ftp:@var{user}@@@var{host}:@var{filename}} uses FTP, whereas 3097@file{/ftp:@var{user}@@@var{host}:@var{filename}} uses FTP, whereas
3095@file{/ssh:@var{user}@@@var{host}:@var{filename}} uses @command{ssh}. 3098@file{/ssh:@var{user}@@@var{host}:@var{filename}} uses @command{ssh}.
3096When you don't specify a method in the file name, Emacs determines a 3099When you don't specify a method in the file name, Emacs chooses
3097default method according to the following rules: 3100the method as follows:
3098 3101
3099@enumerate 3102@enumerate
3100@item 3103@item
3101If the host name starts with @samp{ftp.} (with dot), then Emacs assumes 3104If the host name starts with @samp{ftp.} (with dot), then Emacs uses
3102the @command{ftp} method. 3105FTP.
3103@item 3106@item
3104If the user name is @samp{ftp} or @samp{anonymous}, then Emacs assumes 3107If the user name is @samp{ftp} or @samp{anonymous}, then Emacs uses
3105the @command{ftp} method. 3108FTP.
3106@item 3109@item
3107Otherwise, Emacs assumes the @command{ssh} method. 3110Otherwise, Emacs uses @command{ssh}.
3108@end enumerate 3111@end enumerate
3109 3112
3110@noindent 3113@noindent