[Emacs-diffs] Changes to emacs/lisp/term/x-win.el

[Kenichi Handa]

Index: emacs/lisp/term/x-win.el
diff -c emacs/lisp/term/x-win.el:1.177 emacs/lisp/term/x-win.el:1.178
*** emacs/lisp/term/x-win.el:1.177      Fri Jun 10 01:50:51 2005
--- emacs/lisp/term/x-win.el    Fri Jun 10 05:41:35 2005
***************
*** 2183,2188 ****
--- 2183,2193 ----
            ctext
          utf8)))))
  
+ ;; Get a selection value of type TYPE by calling x-get-selection with
+ ;; an appropiate DATA-TYPE argument decidd by `x-select-request-type'.
+ ;; The return value is already decoded.  If x-get-selection causes an
+ ;; error, this function return nil.
+ 
  (defun x-selection-value (type)
    (let (text)
      (cond ((null x-select-request-type)
***************
*** 2465,2474 ****
  (defun x-clipboard-yank ()
    "Insert the clipboard contents, or the last stretch of killed text."
    (interactive)
!   (let ((clipboard-text 
!        (condition-case nil
!            (x-selection-value 'CLIPBOARD)
!          (error nil)))
        (x-select-enable-clipboard t))
      (if (and clipboard-text (> (length clipboard-text) 0))
        (kill-new clipboard-text))
--- 2470,2476 ----
  (defun x-clipboard-yank ()
    "Insert the clipboard contents, or the last stretch of killed text."
    (interactive)
!   (let ((clipboard-text (x-selection-value 'CLIPBOARD))
        (x-select-enable-clipboard t))
      (if (and clipboard-text (> (length clipboard-text) 0))
        (kill-new clipboard-text))