[Emacs-diffs] Changes to emacs/lisp/progmodes/flymake.el

[Juanma Barranquero]

Index: emacs/lisp/progmodes/flymake.el
diff -c emacs/lisp/progmodes/flymake.el:1.22 
emacs/lisp/progmodes/flymake.el:1.23
*** emacs/lisp/progmodes/flymake.el:1.22        Sat Jul  2 21:12:19 2005
--- emacs/lisp/progmodes/flymake.el     Sun Jul  3 23:18:19 2005
***************
*** 32,37 ****
--- 32,49 ----
  
  ;;; 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,61 ****
  (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))))))
  
  (defsubst flymake-replace-regexp-in-string (regexp rep str)
    (if (fboundp 'replace-regexp-in-string)
--- 65,74 ----
  (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)))))))
  
  (defsubst flymake-replace-regexp-in-string (regexp rep str)
    (if (fboundp 'replace-regexp-in-string)
***************
*** 1138,1161 ****
    (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."
    )
--- 1151,1156 ----
***************
*** 1468,1474 ****
        ;;+(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)))
  
--- 1463,1469 ----
        ;;+(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)))