Mercurial > emacs
comparison man/files.texi @ 90428:a8190f7e546e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 07 Jun 2006 18:05:10 +0000 |
parents | a5812696f7bf c964932a0438 |
children | 138ce2701550 |
comparison
equal
deleted
inserted
replaced
90427:ddb25860d044 | 90428:a8190f7e546e |
---|---|
259 What if you want to create a new file? Just visit it. Emacs displays | 259 What if you want to create a new file? Just visit it. Emacs displays |
260 @samp{(New file)} in the echo area, but in other respects behaves as if | 260 @samp{(New file)} in the echo area, but in other respects behaves as if |
261 you had visited an existing empty file. If you make any changes and | 261 you had visited an existing empty file. If you make any changes and |
262 save them, the file is created. | 262 save them, the file is created. |
263 | 263 |
264 Emacs recognizes from the contents of a file which convention it uses | 264 Emacs recognizes from the contents of a file which end-of-line |
265 to separate lines---newline (used on GNU/Linux and on Unix), | 265 convention it uses to separate lines---newline (used on GNU/Linux and |
266 carriage-return linefeed (used on Microsoft systems), or just | 266 on Unix), carriage-return linefeed (used on Microsoft systems), or |
267 carriage-return (used on the Macintosh)---and automatically converts the | 267 just carriage-return (used on the Macintosh)---and automatically |
268 contents to the normal Emacs convention, which is that the newline | 268 converts the contents to the normal Emacs convention, which is that |
269 character separates lines. This is a part of the general feature of | 269 the newline character separates lines. This is a part of the general |
270 coding system conversion (@pxref{Coding Systems}), and makes it possible | 270 feature of coding system conversion (@pxref{Coding Systems}), and |
271 to edit files imported from different operating systems with | 271 makes it possible to edit files imported from different operating |
272 equal convenience. If you change the text and save the file, Emacs | 272 systems with equal convenience. If you change the text and save the |
273 performs the inverse conversion, changing newlines back into | 273 file, Emacs performs the inverse conversion, changing newlines back |
274 carriage-return linefeed or just carriage-return if appropriate. | 274 into carriage-return linefeed or just carriage-return if appropriate. |
275 | 275 |
276 @vindex find-file-run-dired | 276 @vindex find-file-run-dired |
277 If the file you specify is actually a directory, @kbd{C-x C-f} invokes | 277 If the file you specify is actually a directory, @kbd{C-x C-f} invokes |
278 Dired, the Emacs directory browser, so that you can ``edit'' the contents | 278 Dired, the Emacs directory browser, so that you can ``edit'' the contents |
279 of the directory (@pxref{Dired}). Dired is a convenient way to view, delete, | 279 of the directory (@pxref{Dired}). Dired is a convenient way to view, delete, |
2331 diff-mode}. | 2331 diff-mode}. |
2332 | 2332 |
2333 One general feature of Diff mode is that manual edits to the patch | 2333 One general feature of Diff mode is that manual edits to the patch |
2334 automatically correct line numbers, including those in the hunk | 2334 automatically correct line numbers, including those in the hunk |
2335 header, so that you can actually apply the edited patch. Diff mode | 2335 header, so that you can actually apply the edited patch. Diff mode |
2336 also provides the following commands to navigate, manipulate and apply | 2336 treats each hunk location as an ``error message'', so that you can use |
2337 parts of patches: | 2337 commands such as @kbd{C-x '} to visit the corresponding source |
2338 locations. It also provides the following commands to navigate, | |
2339 manipulate and apply parts of patches: | |
2338 | 2340 |
2339 @table @kbd | 2341 @table @kbd |
2340 @item M-n | 2342 @item M-n |
2341 Move to the next hunk-start (@code{diff-hunk-next}). | 2343 Move to the next hunk-start (@code{diff-hunk-next}). |
2342 | 2344 |