From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 4 Jul 2011 01:06:33 +0000 (+0200)
Subject: lisp/type-break.el (timep): Avoid a byte-compiler warning.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~206^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3abb79e569258dd1e29e9549718f7e4701c61566;p=emacs.git

lisp/type-break.el (timep): Avoid a byte-compiler warning.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e74c9604fd..93cf3c44033 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-04  Juanma Barranquero  <lekktu@gmail.com>
 
+	* type-break.el (timep): Use the value of `float-time' to avoid a
+	byte-compiler warning.
+
 	* server.el (server-eval-and-print): Return any result, even nil.
 
 2011-07-03  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 612c8cf4617..d276e64f6db 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -502,7 +502,7 @@ variable of the same name."
   "If TIME is in the format returned by `current-time' then
 return TIME, else return nil."
   (condition-case nil
-      (progn (float-time time) time)
+      (and (float-time time) time)
     (error nil)))
 
 (defun type-break-choose-file ()