diff options
| author | Chong Yidong | 2008-03-28 19:03:33 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-03-28 19:03:33 +0000 |
| commit | b6e38d7ab4f5dfae75f1614dae1e5964edfa24d1 (patch) | |
| tree | 01add6825d28f126d0560cc7904c26c12ba29c9b /doc | |
| parent | 8583bd46be25bc7b844a64b4f14e527454de1f66 (diff) | |
| download | emacs-b6e38d7ab4f5dfae75f1614dae1e5964edfa24d1.tar.gz emacs-b6e38d7ab4f5dfae75f1614dae1e5964edfa24d1.zip | |
(Diff Mode, Misc File Ops): Describe Transient Mark mode as the
default.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/files.texi | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index d8daf75c571..1199573cc05 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi | |||
| @@ -2597,8 +2597,8 @@ manually editing patches, and only works with the unified diff format. | |||
| 2597 | @item C-c C-u | 2597 | @item C-c C-u |
| 2598 | Convert the entire buffer to unified format | 2598 | Convert the entire buffer to unified format |
| 2599 | (@code{diff-context->unified}). With a prefix argument, convert | 2599 | (@code{diff-context->unified}). With a prefix argument, convert |
| 2600 | unified format to context format. In Transient Mark mode, when the | 2600 | unified format to context format. When the mark is active, convert |
| 2601 | mark is active, this command operates only on the region. | 2601 | only the text within the region. |
| 2602 | 2602 | ||
| 2603 | @item C-c C-w | 2603 | @item C-c C-w |
| 2604 | Refine the current hunk so that it disregards changes in whitespace | 2604 | Refine the current hunk so that it disregards changes in whitespace |
| @@ -2638,7 +2638,9 @@ in Emacs. @xref{Misc Buffer}. | |||
| 2638 | @findex insert-file | 2638 | @findex insert-file |
| 2639 | @kbd{M-x insert-file} (also @kbd{C-x i}) inserts a copy of the | 2639 | @kbd{M-x insert-file} (also @kbd{C-x i}) inserts a copy of the |
| 2640 | contents of the specified file into the current buffer at point, | 2640 | contents of the specified file into the current buffer at point, |
| 2641 | leaving point unchanged before the contents and the mark after them. | 2641 | leaving point unchanged before the contents. The position after the |
| 2642 | inserted contents is added to the mark ring, without activating the | ||
| 2643 | mark (@pxref{Mark Ring}). | ||
| 2642 | 2644 | ||
| 2643 | @findex insert-file-literally | 2645 | @findex insert-file-literally |
| 2644 | @kbd{M-x insert-file-literally} is like @kbd{M-x insert-file}, | 2646 | @kbd{M-x insert-file-literally} is like @kbd{M-x insert-file}, |