summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-12-25 13:34:45 +0200
committerEli Zaretskii <eliz@gnu.org>2010-12-25 13:34:45 +0200
commit2d34d52373c23647dfa55c9199182d1a5bd7a216 (patch)
treebe44bbc661cf9712f6548a26ce92f13bb671d021 /doc
parent88ab43400d4bee3e35ad737aa185442775ddf7dc (diff)
downloademacs-2d34d52373c23647dfa55c9199182d1a5bd7a216.tar.gz
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/ChangeLog5
-rw-r--r--doc/emacs/frames.texi13
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 @@
2010-12-25 Eli Zaretskii <eliz@gnu.org>
+ * 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.
+ (Bug#7702)
+
* trouble.texi (Checklist): Mention debug-on-quit. (Bug#7667)
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.
@end menu
@node Cut and Paste
-@section Killing and Yanking on Graphical Displays
+@section Cutting and Pasting on Graphical Displays
- This section describes commands for selecting a region, killing, and
-yanking using the mouse.
+ This section describes commands for selecting a region, cutting, and
+pasting using the mouse.
@menu
* Mouse Commands:: Moving, cutting, and pasting, with the mouse.
@@ -248,6 +248,13 @@ has no ``memory'': each time you save something in the primary
selection, either in Emacs or in another X application, the previous
contents of the primary selection are lost.
+@cindex MS-Windows, and primary selection
+ MS-Windows provides no primary selection, but Emacs emulates it
+within a single Emacs session: all the features and commands related
+to the primary selection work as described for cutting and pasting
+within the same session, but not across Emacs sessions or with other
+applications.
+
Whenever you kill some text using a command such as @kbd{C-w}
(@code{kill-region}), or copy it into the kill ring using a command
such as @kbd{M-w} (@code{kill-ring-save}), that text is also saved in