From 3abb79e569258dd1e29e9549718f7e4701c61566 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 4 Jul 2011 03:06:33 +0200 Subject: [PATCH] lisp/type-break.el (timep): Avoid a byte-compiler warning. --- lisp/ChangeLog | 3 +++ lisp/type-break.el | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 + * 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 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 () -- 2.39.2