changeset 112077:2f24255ca500

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.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 25 Dec 2010 13:34:45 +0200
parents 9b34017f06c6
children 2285c33f3bb0
files doc/emacs/ChangeLog doc/emacs/frames.texi lisp/ChangeLog lisp/simple.el
diffstat 4 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/doc/emacs/ChangeLog	Sat Dec 25 12:35:16 2010 +0200
+++ b/doc/emacs/ChangeLog	Sat Dec 25 13:34:45 2010 +0200
@@ -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>
--- a/doc/emacs/frames.texi	Sat Dec 25 12:35:16 2010 +0200
+++ b/doc/emacs/frames.texi	Sat Dec 25 13:34:45 2010 +0200
@@ -58,10 +58,10 @@
 @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 @@
 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
--- a/lisp/ChangeLog	Sat Dec 25 12:35:16 2010 +0200
+++ b/lisp/ChangeLog	Sat Dec 25 13:34:45 2010 +0200
@@ -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
--- a/lisp/simple.el	Sat Dec 25 12:35:16 2010 +0200
+++ b/lisp/simple.el	Sat Dec 25 13:34:45 2010 +0200
@@ -3528,7 +3528,7 @@
     (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")