From: Kenichi Handa <handa@m17n.org>
Date: Fri, 10 Jun 2005 05:41:46 +0000 (+0000)
Subject: (x-clipboard-yank): Remove condition-case
X-Git-Tag: emacs-pretest-22.0.90~9154
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8338794e7ced36f47e50a5877b4e716ccbf1060;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3d6cdc98d6..a6f7849346b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+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
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index a4118029eaa..458cff0ae6d 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -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))