[Emacs-diffs] Changes to emacs/lisp/select.el

[Kenichi Handa]

Index: emacs/lisp/select.el
diff -c emacs/lisp/select.el:1.19 emacs/lisp/select.el:1.20
*** emacs/lisp/select.el:1.19   Wed Jan 29 04:19:46 2003
--- emacs/lisp/select.el        Tue Jun 17 06:54:39 2003
***************
*** 38,44 ****
  TYPE may be `SECONDARY' or `CLIPBOARD', in addition to `PRIMARY'.
  DATA-TYPE is usually `STRING', but can also be one of the symbols
  in `selection-converter-alist', which see."
!   (x-get-selection-internal (or type 'PRIMARY) (or data-type 'STRING)))
  
  (defun x-get-clipboard ()
    "Return text pasted to the clipboard."
--- 38,55 ----
  TYPE may be `SECONDARY' or `CLIPBOARD', in addition to `PRIMARY'.
  DATA-TYPE is usually `STRING', but can also be one of the symbols
  in `selection-converter-alist', which see."
!   (let ((data (x-get-selection-internal (or type 'PRIMARY)
!                                       (or data-type 'STRING)))
!       coding)
!     (when (and (stringp data)
!              (setq data-type (get-text-property 0 'foreign-selection data)))
!       (setq coding (if (eq data-type 'UTF8_STRING)
!                      'utf-8
!                    (or next-selection-coding-system
!                        selection-coding-system))
!           data (decode-coding-string data coding))
!       (put-text-property 0 (length data) 'foreign-selection data-type data))
!     data))
  
  (defun x-get-clipboard ()
    "Return text pasted to the clipboard."