;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Code:
(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 `STRING') says how to convert the data."
+and the argument DATA-TYPE (default `STRING') says
+how to convert the data."
(x-get-selection-internal (or type 'PRIMARY) (or data-type 'STRING)))
(defun x-get-clipboard ()
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)))
(setq selection-converter-alist
'((TEXT . xselect-convert-to-string)
+ (COMPOUND_TEXT . xselect-convert-to-string)
(STRING . xselect-convert-to-string)
(TARGETS . xselect-convert-to-targets)
(LENGTH . xselect-convert-to-length)