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.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d0ad25bb1af8e58672d1e03005ae379b863b5828..9cb831f4de88d94eea9d3ec8cb7a182297ed6f06 100644 (file)
--- 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 0383ed9bf2072c4821865d0ba69ccee3b2f0bd36..19b4129605f5eadc0151b1cdeba1d0eb758f8cc9 100644 (file)
--- 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f25b74d6224b6c03f9f19de5dd83cffca118f9f3..bbd6b4302180f8f9e1dc540dcddc2875c7837810 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * simple.el (select-active-regions): Doc fix.  (Bug#7702)
+
 2010-12-24  Kenichi Handa  <handa@m17n.org>
 
        * mail/rmailmm.el (rmail-mime-parse): Perform parsing in

diff --git a/lisp/simple.el b/lisp/simple.el
index 603654c0ea7ded1aacbcf0ca966b33034fd8a4b8..23488272aaa35fea595ddca2997e4e9c543b4daa 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3528,7 +3528,7 @@ a mistake; see the documentation of `set-mark'."
     (signal 'mark-inactive nil)))
 
 (defcustom select-active-regions nil
-  "If non-nil, an active region automatically becomes the window selection."
+  "If non-nil, an active region automatically sets the primary selection."
   :type 'boolean
   :group 'killing
   :version "23.1")