# HG changeset patch # User Juanma Barranquero # Date 1120432699 0 # Node ID b4534bf76ba113c191bfc15f6c8916fc1f260b1b # Parent 01120e7023163ccce540b141c61b5a791c312639 (flymake-find-file): Remove. (flymake-float-time): Use `with-no-warnings'. (flymake-check-start-time, flymake-check-was-interrupted, flymake-err-info, flymake-is-running, flymake-last-change-time, flymake-new-err-info): `defvar' at compile time. diff -r 01120e702316 -r b4534bf76ba1 lisp/progmodes/flymake.el --- a/lisp/progmodes/flymake.el Sun Jul 03 22:49:00 2005 +0000 +++ b/lisp/progmodes/flymake.el Sun Jul 03 23:18:19 2005 +0000 @@ -32,6 +32,18 @@ ;;; Code: +;;;; [[ Silence the byte-compiler + +(eval-when-compile + (defvar flymake-check-start-time) + (defvar flymake-check-was-interrupted) + (defvar flymake-err-info) + (defvar flymake-is-running) + (defvar flymake-last-change-time) + (defvar flymake-new-err-info)) + +;;;; ]] + ;;;; [[ Xemacs overlay compatibility (if (featurep 'xemacs) (progn (autoload 'make-overlay "overlay" "Overlay compatibility kit." t) @@ -53,9 +65,10 @@ (defalias 'flymake-float-time (if (fboundp 'float-time) 'float-time - (lambda () - (multiple-value-bind (s0 s1 s2) (current-time) - (+ (* (float (ash 1 16)) s0) (float s1) (* 0.0000001 s2)))))) + (with-no-warnings + (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) @@ -1138,24 +1151,6 @@ (let* ((include-dirs (append '(".") (flymake-get-project-include-dirs base-dir) (flymake-get-system-include-dirs)))) include-dirs)) -(defun flymake-find-file (rel-file-name include-dirs) - "Iterate through INCLUDE-DIRS to find file REL-FILE-NAME. -Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists, or just REL-FILE-NAME if not." - (let* ((count (length include-dirs)) - (idx 0) - (found nil) - (full-file-name rel-file-name)) - - (while (and (not found) (< idx count)) - (let* ((dir (nth idx include-dirs))) - (setq full-file-name (concat dir "/" rel-file-name)) - (when (file-exists-p full-file-name) - (setq found t))) - (setq idx (1+ idx))) - (if found - full-file-name - rel-file-name))) - (defun flymake-restore-formatting (source-buffer) "Remove any formatting made by flymake." ) @@ -1468,7 +1463,7 @@ ;;+(add-hook 'find-file-hook 'flymake-find-file-hook) (flymake-report-status (current-buffer) "" "") - + (setq flymake-timer (run-at-time nil 1 'flymake-on-timer-event (current-buffer)))