(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.
This commit is contained in:
Richard M. Stallman 2005-07-06 19:03:21 +00:00
parent d25dfeedfc
commit 7ea8834e08
2 changed files with 14 additions and 7 deletions

View file

@ -1,3 +1,10 @@
2005-07-06 Richard M. Stallman <rms@gnu.org>
* progmodes/flymake.el (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.
2005-07-06 Juanma Barranquero <lekktu@gmail.com>
* w32-vars.el (w32-fixed-font-alist): Fix typo in `defcustom' tag.

View file

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