diff options
| author | Eli Zaretskii | 2007-09-13 08:30:45 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2007-09-13 08:30:45 +0000 |
| commit | 4d4efd30f783805c01fa81fe304dc7232832d092 (patch) | |
| tree | 5886a3c556b98ebe8df25df3b23c6fae3a2d29e9 | |
| parent | 1ece6cdb703927f207ab3bae7ccf3c3313bfc9b0 (diff) | |
| download | emacs-4d4efd30f783805c01fa81fe304dc7232832d092.tar.gz emacs-4d4efd30f783805c01fa81fe304dc7232832d092.zip | |
(find-file, find-file-other-window, find-file-other-frame, find-file-existing)
(find-file-read-only, find-file-read-only-other-window)
(find-file-read-only-other-frame, find-alternate-file-other-window)
(find-alternate-file): Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/files.el | 28 |
2 files changed, 28 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f41ef27570e..0fa66e193da 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2007-09-13 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * files.el (find-file, find-file-other-window) | ||
| 4 | (find-file-other-frame, find-file-existing, find-file-read-only) | ||
| 5 | (find-file-read-only-other-window) | ||
| 6 | (find-file-read-only-other-frame) | ||
| 7 | (find-alternate-file-other-window, find-alternate-file): Doc fixes. | ||
| 8 | |||
| 1 | 2007-09-13 Jari Aalto <jari.aalto@cante.net> | 9 | 2007-09-13 Jari Aalto <jari.aalto@cante.net> |
| 2 | 10 | ||
| 3 | * man.el (Man-default-man-entry): At end of line, continue looking | 11 | * man.el (Man-default-man-entry): At end of line, continue looking |
diff --git a/lisp/files.el b/lisp/files.el index fd0c29260b5..163c6a8ea37 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -1068,6 +1068,12 @@ Interactively, the default if you just type RET is the current directory, | |||
| 1068 | but the visited file name is available through the minibuffer history: | 1068 | but the visited file name is available through the minibuffer history: |
| 1069 | type M-n to pull it into the minibuffer. | 1069 | type M-n to pull it into the minibuffer. |
| 1070 | 1070 | ||
| 1071 | You can visit files on remote machines by specifying something | ||
| 1072 | like /ssh:SOME_REMOTE_MACHINE:FILE for the file name. You can | ||
| 1073 | also visit local files as a different user by specifying | ||
| 1074 | /sudo::FILE for the file name. See the documentation of | ||
| 1075 | `tramp-methods' and the Tramp Info manual, for more about this. | ||
| 1076 | |||
| 1071 | Interactively, or if WILDCARDS is non-nil in a call from Lisp, | 1077 | Interactively, or if WILDCARDS is non-nil in a call from Lisp, |
| 1072 | expand wildcards (if any) and visit multiple files. You can | 1078 | expand wildcards (if any) and visit multiple files. You can |
| 1073 | suppress wildcard expansion by setting `find-file-wildcards' to nil. | 1079 | suppress wildcard expansion by setting `find-file-wildcards' to nil. |
| @@ -1082,8 +1088,9 @@ automatically choosing a major mode, use \\[find-file-literally]." | |||
| 1082 | 1088 | ||
| 1083 | (defun find-file-other-window (filename &optional wildcards) | 1089 | (defun find-file-other-window (filename &optional wildcards) |
| 1084 | "Edit file FILENAME, in another window. | 1090 | "Edit file FILENAME, in another window. |
| 1085 | May create a new window, or reuse an existing one. | 1091 | |
| 1086 | See the function `display-buffer'. | 1092 | Like \\[find-file] (which see), but creates a new window or reuses |
| 1093 | an existing one. See the function `display-buffer'. | ||
| 1087 | 1094 | ||
| 1088 | Interactively, the default if you just type RET is the current directory, | 1095 | Interactively, the default if you just type RET is the current directory, |
| 1089 | but the visited file name is available through the minibuffer history: | 1096 | but the visited file name is available through the minibuffer history: |
| @@ -1102,8 +1109,9 @@ expand wildcards (if any) and visit multiple files." | |||
| 1102 | 1109 | ||
| 1103 | (defun find-file-other-frame (filename &optional wildcards) | 1110 | (defun find-file-other-frame (filename &optional wildcards) |
| 1104 | "Edit file FILENAME, in another frame. | 1111 | "Edit file FILENAME, in another frame. |
| 1105 | May create a new frame, or reuse an existing one. | 1112 | |
| 1106 | See the function `display-buffer'. | 1113 | Like \\[find-file] (which see), but creates a new frame or reuses |
| 1114 | an existing one. See the function `display-buffer'. | ||
| 1107 | 1115 | ||
| 1108 | Interactively, the default if you just type RET is the current directory, | 1116 | Interactively, the default if you just type RET is the current directory, |
| 1109 | but the visited file name is available through the minibuffer history: | 1117 | but the visited file name is available through the minibuffer history: |
| @@ -1122,7 +1130,7 @@ expand wildcards (if any) and visit multiple files." | |||
| 1122 | 1130 | ||
| 1123 | (defun find-file-existing (filename) | 1131 | (defun find-file-existing (filename) |
| 1124 | "Edit the existing file FILENAME. | 1132 | "Edit the existing file FILENAME. |
| 1125 | Like \\[find-file] but only allow a file that exists, and do not allow | 1133 | Like \\[find-file], but only allow a file that exists, and do not allow |
| 1126 | file names with wildcards." | 1134 | file names with wildcards." |
| 1127 | (interactive (nbutlast (find-file-read-args "Find existing file: " t))) | 1135 | (interactive (nbutlast (find-file-read-args "Find existing file: " t))) |
| 1128 | (if (and (not (interactive-p)) (not (file-exists-p filename))) | 1136 | (if (and (not (interactive-p)) (not (file-exists-p filename))) |
| @@ -1132,7 +1140,7 @@ file names with wildcards." | |||
| 1132 | 1140 | ||
| 1133 | (defun find-file-read-only (filename &optional wildcards) | 1141 | (defun find-file-read-only (filename &optional wildcards) |
| 1134 | "Edit file FILENAME but don't allow changes. | 1142 | "Edit file FILENAME but don't allow changes. |
| 1135 | Like \\[find-file] but marks buffer as read-only. | 1143 | Like \\[find-file], but marks buffer as read-only. |
| 1136 | Use \\[toggle-read-only] to permit editing." | 1144 | Use \\[toggle-read-only] to permit editing." |
| 1137 | (interactive (find-file-read-args "Find file read-only: " nil)) | 1145 | (interactive (find-file-read-args "Find file read-only: " nil)) |
| 1138 | (unless (or (and wildcards find-file-wildcards | 1146 | (unless (or (and wildcards find-file-wildcards |
| @@ -1147,7 +1155,7 @@ Use \\[toggle-read-only] to permit editing." | |||
| 1147 | 1155 | ||
| 1148 | (defun find-file-read-only-other-window (filename &optional wildcards) | 1156 | (defun find-file-read-only-other-window (filename &optional wildcards) |
| 1149 | "Edit file FILENAME in another window but don't allow changes. | 1157 | "Edit file FILENAME in another window but don't allow changes. |
| 1150 | Like \\[find-file-other-window] but marks buffer as read-only. | 1158 | Like \\[find-file-other-window], but marks buffer as read-only. |
| 1151 | Use \\[toggle-read-only] to permit editing." | 1159 | Use \\[toggle-read-only] to permit editing." |
| 1152 | (interactive (find-file-read-args "Find file read-only other window: " nil)) | 1160 | (interactive (find-file-read-args "Find file read-only other window: " nil)) |
| 1153 | (unless (or (and wildcards find-file-wildcards | 1161 | (unless (or (and wildcards find-file-wildcards |
| @@ -1162,7 +1170,7 @@ Use \\[toggle-read-only] to permit editing." | |||
| 1162 | 1170 | ||
| 1163 | (defun find-file-read-only-other-frame (filename &optional wildcards) | 1171 | (defun find-file-read-only-other-frame (filename &optional wildcards) |
| 1164 | "Edit file FILENAME in another frame but don't allow changes. | 1172 | "Edit file FILENAME in another frame but don't allow changes. |
| 1165 | Like \\[find-file-other-frame] but marks buffer as read-only. | 1173 | Like \\[find-file-other-frame], but marks buffer as read-only. |
| 1166 | Use \\[toggle-read-only] to permit editing." | 1174 | Use \\[toggle-read-only] to permit editing." |
| 1167 | (interactive (find-file-read-args "Find file read-only other frame: " nil)) | 1175 | (interactive (find-file-read-args "Find file read-only other frame: " nil)) |
| 1168 | (unless (or (and wildcards find-file-wildcards | 1176 | (unless (or (and wildcards find-file-wildcards |
| @@ -1179,6 +1187,8 @@ Use \\[toggle-read-only] to permit editing." | |||
| 1179 | "Find file FILENAME as a replacement for the file in the next window. | 1187 | "Find file FILENAME as a replacement for the file in the next window. |
| 1180 | This command does not select that window. | 1188 | This command does not select that window. |
| 1181 | 1189 | ||
| 1190 | See \\[find-file] for the possible forms of the FILENAME argument. | ||
| 1191 | |||
| 1182 | Interactively, or if WILDCARDS is non-nil in a call from Lisp, | 1192 | Interactively, or if WILDCARDS is non-nil in a call from Lisp, |
| 1183 | expand wildcards (if any) and replace the file with multiple files." | 1193 | expand wildcards (if any) and replace the file with multiple files." |
| 1184 | (interactive | 1194 | (interactive |
| @@ -1204,6 +1214,8 @@ expand wildcards (if any) and replace the file with multiple files." | |||
| 1204 | If the current buffer now contains an empty file that you just visited | 1214 | If the current buffer now contains an empty file that you just visited |
| 1205 | \(presumably by mistake), use this command to visit the file you really want. | 1215 | \(presumably by mistake), use this command to visit the file you really want. |
| 1206 | 1216 | ||
| 1217 | See \\[find-file] for the possible forms of the FILENAME argument. | ||
| 1218 | |||
| 1207 | Interactively, or if WILDCARDS is non-nil in a call from Lisp, | 1219 | Interactively, or if WILDCARDS is non-nil in a call from Lisp, |
| 1208 | expand wildcards (if any) and replace the file with multiple files. | 1220 | expand wildcards (if any) and replace the file with multiple files. |
| 1209 | 1221 | ||