X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fx-select.el;h=62ae9a89edee03c5370a361fc5ce926479cc53f0;hb=1c4db7b1b9fb2d5e5c6768beb767a5cecfb303c3;hp=b3ee61cdaef41d20d48e00677af1db3b8864080e;hpb=cbb40ed4dbe8dad2c432475e1cc91742886f1ef4;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/x-select.el b/lisp/x-select.el
index b3ee61c..62ae9a8 100644
--- a/lisp/x-select.el
+++ b/lisp/x-select.el
@@ -50,6 +50,9 @@
   'select-make-extent-for-selection)
 (define-obsolete-function-alias 'x-cut-copy-clear-internal 'cut-copy-clear-internal)
 (define-obsolete-function-alias 'x-get-selection 'get-selection)
+(define-obsolete-function-alias 'x-get-clipboard 'get-clipboard)
+(define-obsolete-function-alias 'x-yank-clipboard-selection 
+  'yank-clipboard-selection)
 (define-obsolete-function-alias 'x-disown-selection-internal
   'disown-selection-internal)
 
@@ -57,10 +60,6 @@
   "Return text selected from some X window."
   (get-selection 'SECONDARY))
 
-(defun x-get-clipboard ()
-  "Return text pasted to the clipboard."
-  (get-selection 'CLIPBOARD))
-
 (defun x-own-secondary-selection (selection &optional type)
   "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
@@ -70,7 +69,7 @@ be the text between those markers)."
 		 (list (cons ;; these need not be ordered.
 			(copy-marker (point-marker))
 			(copy-marker (mark-marker))))))
-  (x-own-selection selection 'SECONDARY))
+  (own-selection selection 'SECONDARY))
 
 (defun x-notice-selection-requests (selection type successful)
   "for possible use as the value of x-sent-selection-hooks."
@@ -103,7 +102,7 @@ be the text between those markers)."
 
 (defun xselect-kill-buffer-hook-1 (selection)
   (let (value)
-    (if (and (x-selection-owner-p selection)
+    (if (and (selection-owner-p selection)
 	     (setq value (get-selection-internal selection '_EMACS_INTERNAL))
 	     ;; The _EMACS_INTERNAL selection type has a converter registered
 	     ;; for it that does no translation.  This only works if emacs is
@@ -154,19 +153,6 @@ into Emacs."
 	 (x-store-cutbuffer-internal 'CUT_BUFFER0 string))))
 
 
-;;; Random utility functions
-
-(defun x-yank-clipboard-selection ()
-  "Insert the current Clipboard selection at point."
-  (interactive "*")
-  (setq last-command nil)
-  (setq this-command 'yank) ; so that yank-pop works.
-  (let ((clip (x-get-clipboard)))
-    (or clip (error "there is no clipboard selection"))
-    (push-mark)
-    (insert clip)))
-
-
 ;FSFmacs (provide 'select)
 
 ;;; x-select.el ends here.