[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100330: Fix bug #7702 with docs of selections wrt MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100330
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-12-25 13:34:45 +0200
message:
  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.
modified:
  doc/emacs/ChangeLog
  doc/emacs/frames.texi
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-12-25 10:35:16 +0000
+++ b/doc/emacs/ChangeLog       2010-12-25 11:34:45 +0000
@@ -1,5 +1,10 @@
 2010-12-25  Eli Zaretskii  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi     2010-06-23 02:46:43 +0000
+++ b/doc/emacs/frames.texi     2010-12-25 11:34:45 +0000
@@ -58,10 +58,10 @@
 @end menu
 
 @node Cut and Paste
address@hidden Killing and Yanking on Graphical Displays
address@hidden 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.
 
address@hidden 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-24 14:00:14 +0000
+++ b/lisp/ChangeLog    2010-12-25 11:34:45 +0000
@@ -1,3 +1,7 @@
+2010-12-25  Eli Zaretskii  <address@hidden>
+
+       * simple.el (select-active-regions): Doc fix.  (Bug#7702)
+
 2010-12-24  Kenichi Handa  <address@hidden>
 
        * mail/rmailmm.el (rmail-mime-parse): Perform parsing in

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2010-12-10 17:46:40 +0000
+++ b/lisp/simple.el    2010-12-25 11:34:45 +0000
@@ -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")