changeset 64109:1e30080a8802

(flymake-float-time): Instead of with-no-warnings, test for xemacs. (flymake-replace-regexp-in-string): Test fboundp of replace-in-string to avoid warning.
author Richard M. Stallman <rms@gnu.org>
date Wed, 06 Jul 2005 19:00:21 +0000
parents e663ffe2941f
children 8640e1fdbf57
files lisp/progmodes/flymake.el
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/progmodes/flymake.el	Wed Jul 06 13:58:31 2005 +0000
+++ b/lisp/progmodes/flymake.el	Wed Jul 06 19:00:21 2005 +0000
@@ -64,15 +64,15 @@
 (defalias 'flymake-float-time
   (if (fboundp 'float-time)
       'float-time
-    (with-no-warnings
-      (lambda ()
-        (multiple-value-bind (s0 s1 s2) (current-time)
-          (+ (* (float (ash 1 16)) s0) (float s1) (* 0.0000001 s2)))))))
+    (if (featurep 'xemacs)
+	(lambda ()
+	  (multiple-value-bind (s0 s1 s2) (current-time)
+	    (+ (* (float (ash 1 16)) s0) (float s1) (* 0.0000001 s2)))))))
 
 (defsubst flymake-replace-regexp-in-string (regexp rep str)
-  (if (fboundp 'replace-regexp-in-string)
-      (replace-regexp-in-string regexp rep str)
-    (replace-in-string str regexp rep)))
+  (if (fboundp 'replace-in-string)
+      (replace-in-string str regexp rep)
+    (replace-regexp-in-string regexp rep str)))
 
 (defun flymake-split-string (str pattern)
   "Split STR into a list of substrings bounded by PATTERN.