*** empty log message ***

[gnu-emacs] / lisp / select.el

diff --git a/lisp/select.el b/lisp/select.el
index b953743fd8bd2052ee6703984d719e8ef7abfc76..b27287e4b4dca6b220222beac50c877c92ab83bb 100644 (file)
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -29,9 +29,9 @@
 (defun x-get-selection (&optional type data-type)
   "Return the value of an X Windows selection.
 The argument TYPE (default `PRIMARY') says which selection, 
-and the argument DATA-TYPE (default `COMPOUND_TEXT') says
+and the argument DATA-TYPE (default `STRING') says
 how to convert the data."
-  (x-get-selection-internal (or type 'PRIMARY) (or data-type 'COMPOUND_TEXT)))
+  (x-get-selection-internal (or type 'PRIMARY) (or data-type 'STRING)))
 
 (defun x-get-clipboard ()
   "Return text pasted to the clipboard."
@@ -51,10 +51,11 @@ can alter the effective value of the selection.
 
 The data may also be a vector of valid non-vector selection values.
 
-Interactively, the text of the region is used as the selection value."
+Interactively, the text of the region is used as the selection value
+if the prefix arg is set."
   (interactive (if (not current-prefix-arg)
                   (list 'PRIMARY (read-string "Set text for pasting: "))
-                (list 'PRIMARY (substring (region-beginning) (region-end)))))
+                (list 'PRIMARY (buffer-substring (region-beginning) (region-end)))))
   ;; This is for temporary compatibility with pre-release Emacs 19.
   (if (stringp type)
       (setq type (intern type)))