Mercurial > emacs
diff lisp/emacs-lisp/lselect.el @ 90224:2d92f5c9d6ae
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 514-518)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 104-105)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 26 Aug 2005 09:51:52 +0000 |
| parents | f9a65d7ebd29 5b1a238fcbb4 |
| children | a3716f7538f2 |
line wrap: on
line diff
--- a/lisp/emacs-lisp/lselect.el Fri Aug 05 10:57:36 2005 +0000 +++ b/lisp/emacs-lisp/lselect.el Fri Aug 26 09:51:52 2005 +0000 @@ -1,6 +1,7 @@ ;;; lselect.el --- Lucid interface to X Selections -;; Copyright (C) 1990, 1993, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1993, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations @@ -101,9 +102,9 @@ (defun x-own-selection (selection &optional type) - "Make a primary X Selection of the given argument. -The argument may be a string, a cons of two markers, or an extent. -In the latter cases the selection is considered to be the text + "Make a primary X Selection of the given argument. +The argument may be a string, a cons of two markers, or an extent. +In the latter cases the selection is considered to be the text between the markers, or the between extents endpoints." (interactive (if (not current-prefix-arg) (list (read-string "Store text for pasting: ")) @@ -124,7 +125,7 @@ (defun x-own-secondary-selection (selection &optional type) - "Make a secondary X Selection of the given argument. The argument may be a + "Make a secondary X Selection of the given argument. The argument may be a string or a cons of two markers (in which case the selection is considered to be the text between those markers.)" (interactive (if (not current-prefix-arg) @@ -182,7 +183,7 @@ ;; Random utility functions (defun x-kill-primary-selection () - "If there is a selection, delete the text it covers, and copy it to + "If there is a selection, delete the text it covers, and copy it to both the kill ring and the Clipboard." (interactive) (or (x-selection-owner-p) (error "emacs does not own the primary selection"))