diff options
author | Miles Bader <miles@gnu.org> | 2006-11-07 23:22:48 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2006-11-07 23:22:48 +0000 |
commit | dbc3b08c405a7b1c0ddb0fb0c98164b355802af5 (patch) | |
tree | 00c6f28244409d14bec11e221fb3c03daef63fc6 /lisp/emacs-lisp/lselect.el | |
parent | bbb6e8f2b6037dc1ee4ddd6cb63a1a6ddb04a591 (diff) | |
parent | 86cb14475e9e76f0b3323d2e7110a4a2bd310cdb (diff) | |
download | emacs-dbc3b08c405a7b1c0ddb0fb0c98164b355802af5.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 490-504)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 161-163)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130
Diffstat (limited to 'lisp/emacs-lisp/lselect.el')
-rw-r--r-- | lisp/emacs-lisp/lselect.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el index 1d40d2e8368..5aed4822818 100644 --- a/lisp/emacs-lisp/lselect.el +++ b/lisp/emacs-lisp/lselect.el @@ -191,7 +191,7 @@ secondary selection instead of the primary selection." "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")) + (or (x-selection-owner-p) (error "Emacs does not own the primary selection")) (setq last-command nil) (or primary-selection-extent (error "the primary selection is not an extent?")) @@ -205,7 +205,7 @@ both the kill ring and the Clipboard." "If there is a selection, delete the text it covers *without* copying it to the kill ring or the Clipboard." (interactive) - (or (x-selection-owner-p) (error "emacs does not own the primary selection")) + (or (x-selection-owner-p) (error "Emacs does not own the primary selection")) (setq last-command nil) (or primary-selection-extent (error "the primary selection is not an extent?")) @@ -219,7 +219,7 @@ the kill ring or the Clipboard." "If there is a selection, copy it to both the kill ring and the Clipboard." (interactive) (setq last-command nil) - (or (x-selection-owner-p) (error "emacs does not own the primary selection")) + (or (x-selection-owner-p) (error "Emacs does not own the primary selection")) (or primary-selection-extent (error "the primary selection is not an extent?")) (save-excursion |