diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-12-25 13:34:45 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-12-25 13:34:45 +0200 |
| commit | 2d34d52373c23647dfa55c9199182d1a5bd7a216 (patch) | |
| tree | be44bbc661cf9712f6548a26ce92f13bb671d021 | |
| parent | 88ab43400d4bee3e35ad737aa185442775ddf7dc (diff) | |
| download | emacs-2d34d52373c23647dfa55c9199182d1a5bd7a216.tar.gz emacs-2d34d52373c23647dfa55c9199182d1a5bd7a216.tar.bz2 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.
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/frames.texi | 13 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 2 |
4 files changed, 20 insertions, 4 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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f25b74d6224..bbd6b430218 100644 --- 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 603654c0ea7..23488272aaa 100644 --- 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") |