(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.

1 files changed, 7 insertions, 7 deletions

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 0fb5411e79..4c5f3ad12b 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -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.