Commit d8338794 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(x-clipboard-yank): Remove condition-case

wrapping.
parent 121c59a3
2005-06-10 Kenichi Handa <handa@m17n.org>
* term/x-win.el (x-clipboard-yank): Remove condition-case
wrapping.
2005-06-11 Kenichi Handa <handa@m17n.org>
* add-log.el (change-log-font-lock-keywords): Make the regexp for
date lines stricter.
2005-06-10 Zhang Wei <id.brep@gmail.com> (tiny change)
 
* term/x-win.el (x-clipboard-yank): Use x-selection-value instead
......
......@@ -2183,6 +2183,11 @@ order until succeed.")
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,10 +2470,7 @@ order until succeed.")
(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)))
(let ((clipboard-text (x-selection-value 'CLIPBOARD))
(x-select-enable-clipboard t))
(if (and clipboard-text (> (length clipboard-text) 0))
(kill-new clipboard-text))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment