diff options
| author | Eli Zaretskii | 2010-12-25 13:34:45 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-12-25 13:34:45 +0200 |
| commit | 2d34d52373c23647dfa55c9199182d1a5bd7a216 (patch) | |
| tree | be44bbc661cf9712f6548a26ce92f13bb671d021 /doc | |
| parent | 88ab43400d4bee3e35ad737aa185442775ddf7dc (diff) | |
| download | emacs-2d34d52373c23647dfa55c9199182d1a5bd7a216.tar.gz emacs-2d34d52373c23647dfa55c9199182d1a5bd7a216.zip | |
Fix bug #7702 with docs of selections wrt MS-Windows.
doc/emacs/frames.texi (Cut and Paste): Modify the section's name and text:
don't mix "cut/paste" with "kill/yank".
(Cut/Paste Other App): Describe the per-session emulation of PRIMARY.
lisp/simple.el (select-active-regions): Doc fix.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/frames.texi | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index d0ad25bb1af..9cb831f4de8 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2010-12-25 Eli Zaretskii <eliz@gnu.org> | 1 | 2010-12-25 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * frames.texi (Cut and Paste): Modify the section's name and text: | ||
| 4 | don't mix "cut/paste" with "kill/yank". | ||
| 5 | (Cut/Paste Other App): Describe the per-session emulation of PRIMARY. | ||
| 6 | (Bug#7702) | ||
| 7 | |||
| 3 | * trouble.texi (Checklist): Mention debug-on-quit. (Bug#7667) | 8 | * trouble.texi (Checklist): Mention debug-on-quit. (Bug#7667) |
| 4 | 9 | ||
| 5 | 2010-12-18 Glenn Morris <rgm@gnu.org> | 10 | 2010-12-18 Glenn Morris <rgm@gnu.org> |
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 0383ed9bf20..19b4129605f 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi | |||
| @@ -58,10 +58,10 @@ so that you can use many of the features described in this chapter. | |||
| 58 | @end menu | 58 | @end menu |
| 59 | 59 | ||
| 60 | @node Cut and Paste | 60 | @node Cut and Paste |
| 61 | @section Killing and Yanking on Graphical Displays | 61 | @section Cutting and Pasting on Graphical Displays |
| 62 | 62 | ||
| 63 | This section describes commands for selecting a region, killing, and | 63 | This section describes commands for selecting a region, cutting, and |
| 64 | yanking using the mouse. | 64 | pasting using the mouse. |
| 65 | 65 | ||
| 66 | @menu | 66 | @menu |
| 67 | * Mouse Commands:: Moving, cutting, and pasting, with the mouse. | 67 | * Mouse Commands:: Moving, cutting, and pasting, with the mouse. |
| @@ -248,6 +248,13 @@ has no ``memory'': each time you save something in the primary | |||
| 248 | selection, either in Emacs or in another X application, the previous | 248 | selection, either in Emacs or in another X application, the previous |
| 249 | contents of the primary selection are lost. | 249 | contents of the primary selection are lost. |
| 250 | 250 | ||
| 251 | @cindex MS-Windows, and primary selection | ||
| 252 | MS-Windows provides no primary selection, but Emacs emulates it | ||
| 253 | within a single Emacs session: all the features and commands related | ||
| 254 | to the primary selection work as described for cutting and pasting | ||
| 255 | within the same session, but not across Emacs sessions or with other | ||
| 256 | applications. | ||
| 257 | |||
| 251 | Whenever you kill some text using a command such as @kbd{C-w} | 258 | Whenever you kill some text using a command such as @kbd{C-w} |
| 252 | (@code{kill-region}), or copy it into the kill ring using a command | 259 | (@code{kill-region}), or copy it into the kill ring using a command |
| 253 | such as @kbd{M-w} (@code{kill-ring-save}), that text is also saved in | 260 | such as @kbd{M-w} (@code{kill-ring-save}), that text is also saved in |