[Emacs-diffs] scratch/flymake-refactor 50a6920 04/18: Make flymake-tests.el friendlier to interactive runs

[Jo�o T�vora]

branch: scratch/flymake-refactor
commit 50a69202859245c76929731b496daf8040d61ba1
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    Make flymake-tests.el friendlier to interactive runs
    
    * test/lisp/progmodes/flymake-tests.el
    (flymake-tests--current-face): Don't kill file buffers already
    being visited before the test starts.
---
 test/lisp/progmodes/flymake-tests.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/lisp/progmodes/flymake-tests.el 
b/test/lisp/progmodes/flymake-tests.el
index 27338d1..16c422d 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -36,10 +36,11 @@
 
 ;; Warning predicate
 (defun flymake-tests--current-face (file predicate)
-  (let ((buffer (find-file-noselect
-                 (expand-file-name file flymake-tests-data-directory)))
-        (process-environment (cons "LC_ALL=C" process-environment))
-        (i 0))
+  (let* ((file (expand-file-name file flymake-tests-data-directory))
+         (visiting (find-buffer-visiting file))
+         (buffer (or visiting (find-file-noselect file)))
+         (process-environment (cons "LC_ALL=C" process-environment))
+         (i 0))
     (unwind-protect
         (with-current-buffer buffer
           (setq-local flymake-proc-warning-predicate predicate)
@@ -59,7 +60,9 @@
             (sleep-for (+ 0.5 flymake-no-changes-timeout)))
           (flymake-goto-next-error)
           (face-at-point))
-      (and buffer (let (kill-buffer-query-functions) (kill-buffer buffer))))))
+      (and buffer
+           (not visiting)
+           (let (kill-buffer-query-functions) (kill-buffer buffer))))))
 
 (ert-deftest warning-predicate-rx-gcc ()
   "Test GCC warning via regexp predicate."