diff lisp/select.el @ 843:f46864126a0d

[xemacs-hg @ 2002-05-15 15:27:40 by stephent] fix yank-pop bug correctly <87adr1zbdd.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Wed, 15 May 2002 15:27:58 +0000
parents 42a86787d173
children 74899b430f18
line wrap: on
line diff
--- a/lisp/select.el	Tue May 14 18:14:30 2002 +0000
+++ b/lisp/select.el	Wed May 15 15:27:58 2002 +0000
@@ -76,8 +76,13 @@
 
 (defun get-clipboard ()
   "Return text pasted to the clipboard.
+Not suitable for `interprogram-paste-function', use `get-clipboard-foreign'."
+  (get-selection 'CLIPBOARD))
+
+(defun get-clipboard-foreign ()
+  "Return text pasted to the clipboard by another program.
 See `interprogram-paste-function' for more information."
-  (get-selection 'CLIPBOARD))
+  (get-selection-foreign 'CLIPBOARD))
 
 (define-device-method get-cutbuffer
   "Return the value of one of the cut buffers.
@@ -91,11 +96,11 @@
   (condition-case nil (get-selection type data-type) (t nil)))
 
 (defun get-selection (&optional type data-type)
-  "Return the value of a window-system selection, or nil if XEmacs owns it.
+  "Return the value of a window-system selection.
 The argument TYPE (default `PRIMARY') says which selection,
 and the argument DATA-TYPE (default `STRING', or `COMPOUND_TEXT' under Mule)
 says how to convert the data. If there is no selection an error is signalled.
-See `interprogram-paste-function' for more information."
+Not suitable in a `interprogram-paste-function', q.v."
   (or type (setq type 'PRIMARY))
   (or data-type (setq data-type selected-text-type))
   (if (consp data-type)