* test/: Use lexical-binding the few remaining files

* test/manual/biditest.el: Use lexical-binding.
(biditest-generate-testfile): Remove unused var `levels`.

* test/manual/image-circular-tests.el: Use lexical-binding.

* test/manual/image-size-tests.el: Use lexical-binding.
(image-size-tests): Check `fboundp` before calling `imagemagick-types`.

* test/manual/redisplay-testsuite.el: Use lexical-binding.

* test/manual/cedet/cedet-utests.el: Use lexical-binding.
Use `with-current-buffer`.
(cedet-utest): Test `fboundp` i.s.o `featurep` to silence warning.
(srecode-map-save-file): Declare var.
(pulse-test): Test `fboundp` before calling `pulse-available-p`.
Declare `pulse-momentary-highlight-overlay` since it's not autoloaded.

* test/manual/cedet/semantic-tests.el: Use lexical-binding.
Use `with-current-buffer`.
(semanticdb-ebrowse-dump): Remove unused var `ab`.
(semanticdb-test-gnu-global): Don't use obsolete "name" arg to constructor.
(cedet-utest-directory): Declare var.

6 files changed, 42 insertions, 37 deletions

diff --git a/test/manual/biditest.el b/test/manual/biditest.el
index dc78ef55b03..a77fc158807 100644
--- a/test/manual/biditest.el
+++ b/test/manual/biditest.el
@@ -1,4 +1,4 @@
-;;; biditest.el --- test bidi reordering in GNU Emacs display engine.
+;;; biditest.el --- test bidi reordering in GNU Emacs display engine.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2013-2021 Free Software Foundation, Inc.
 
@@ -54,7 +54,7 @@ The resulting file should be viewed with `inhibit-bidi-mirroring' set to t."
 		(resolved-paragraph (match-string 3))
 		;; FIXME: Should compare LEVELS with what the display
 		;; engine actually produced.
-		(levels (match-string 4))
+		;;(levels (match-string 4))
 		(indices (match-string 5)))
 	    (setq codes (split-string codes " ")
 		  indices (split-string indices " "))
@@ -120,4 +120,4 @@ BidiCharacterTest.txt file."
   (interactive)
   (message "%s" (bidi-resolved-levels)))
 
-(define-key global-map [f8] 'bidi-levels)
+(define-key global-map [f8] #'bidi-levels)
diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el
index e421054102d..d68b5b8c090 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -1,4 +1,4 @@
-;;; cedet-utests.el --- Run all unit tests in the CEDET suite.
+;;; cedet-utests.el --- Run all unit tests in the CEDET suite.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2008-2021 Free Software Foundation, Inc.
 
@@ -120,9 +120,9 @@
 EXIT-ON-ERROR causes the test suite to exit on an error, instead
 of just logging the error."
   (interactive)
-  (if (or (not (featurep 'semantic/db-mode))
-	  (not (semanticdb-minor-mode-p)))
-      (error "CEDET Tests require semantic-mode to be enabled"))
+  (unless (and (fboundp 'semanticdb-minor-mode-p)
+               (semanticdb-minor-mode-p))
+    (error "CEDET Tests require semantic-mode to be enabled"))
   (dolist (L cedet-utest-libs)
     (load-file (expand-file-name (concat L ".el") cedet-utest-directory)))
   (cedet-utest-log-setup "ALL TESTS")
@@ -170,6 +170,8 @@ of just logging the error."
   (declare (obsolete nil "27.1"))
   noninteractive)
 
+(defvar srecode-map-save-file)
+
 ;;;###autoload
 (defun cedet-utest-batch ()
   "Run the CEDET unit test in BATCH mode."
@@ -178,6 +180,7 @@ of just logging the error."
   (condition-case err
       (when (catch 'cedet-utest-exit-on-error
 	      ;; Get basic semantic features up.
+	      ;; FIXME: I can't see any such function in our code!
 	      (semantic-load-enable-minimum-features)
 	      ;; Disables all caches related to semantic DB so all
 	      ;; tests run as if we have bootstrapped CEDET for the
@@ -231,8 +234,7 @@ Optional argument TITLE is the title of this testing session."
       (setq cedet-utest-frame (make-frame cedet-utest-frame-parameters)))
     (when (or (not cedet-utest-buffer) (not (buffer-live-p cedet-utest-buffer)))
       (setq cedet-utest-buffer (get-buffer-create "*CEDET utest log*")))
-    (save-excursion
-      (set-buffer cedet-utest-buffer)
+    (with-current-buffer cedet-utest-buffer
       (setq cedet-utest-last-log-item nil)
       (when (not cedet-running-master-tests)
 	(erase-buffer))
@@ -254,7 +256,7 @@ Argument START and END bound the time being calculated."
      (- (car (cdr end)) (car (cdr start)))
      (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
 
-(defun cedet-utest-log-shutdown (title &optional errorcondition)
+(defun cedet-utest-log-shutdown (title &optional _errorcondition)
   "Shut-down a larger test suite.
 TITLE is the section that is done.
 ERRORCONDITION is some error that may have occurred during testing."
@@ -274,8 +276,7 @@ ERRORCONDITION is some error that may have occurred during testing."
 	(message "     Elapsed Time %.2f Seconds\n"
 		 (cedet-utest-elapsed-time startime endtime)))
 
-    (save-excursion
-      (set-buffer cedet-utest-buffer)
+    (with-current-buffer cedet-utest-buffer
       (goto-char (point-max))
       (insert "\n>> Test Suite " title " ended at @ "
 	      (format-time-string "%c" endtime) "\n"
@@ -305,12 +306,11 @@ ERRORCONDITION is some error that may have occurred during testing."
   "Hook run after the current log command was run."
     (if noninteractive
 	(message "")
-      (save-excursion
-	(set-buffer cedet-utest-buffer)
+      (with-current-buffer cedet-utest-buffer
 	(goto-char (point-max))
 	(insert "\n\n")))
     (setq cedet-utest-last-log-item nil)
-    (remove-hook 'post-command-hook 'cedet-utest-post-command-hook)
+    (remove-hook 'post-command-hook #'cedet-utest-post-command-hook)
     )
 
 (defun cedet-utest-add-log-item-start (item)
@@ -318,12 +318,11 @@ ERRORCONDITION is some error that may have occurred during testing."
   (unless (equal item cedet-utest-last-log-item)
     (setq cedet-utest-last-log-item item)
     ;; This next line makes sure we clear out status during logging.
-    (add-hook 'post-command-hook 'cedet-utest-post-command-hook)
+    (add-hook 'post-command-hook #'cedet-utest-post-command-hook)
 
     (if noninteractive
 	(message " - Running %s ..." item)
-      (save-excursion
-	(set-buffer cedet-utest-buffer)
+      (with-current-buffer cedet-utest-buffer
 	(goto-char (point-max))
 	(when (not (bolp)) (insert "\n"))
 	(insert "Running " item " ... ")
@@ -343,8 +342,7 @@ Optional argument PRECR indicates to prefix the done msg w/ a newline."
 	  (message "   * %s {%s}" (or err "done") notes)
 	(message "   * %s" (or err "done")))
     ;; Interactive-mode - insert into the buffer.
-    (save-excursion
-      (set-buffer cedet-utest-buffer)
+    (with-current-buffer cedet-utest-buffer
       (goto-char (point-max))
       (when precr (insert "\n"))
       (if err
@@ -378,12 +376,11 @@ Optional argument PRECR indicates to prefix the done msg w/ a newline."
   "Log the text string FORMAT.
 The rest of the ARGS are used to fill in FORMAT with `format'."
   (if noninteractive
-      (apply 'message format args)
-    (save-excursion
-      (set-buffer cedet-utest-buffer)
+      (apply #'message format args)
+    (with-current-buffer cedet-utest-buffer
       (goto-char (point-max))
       (when (not (bolp)) (insert "\n"))
-      (insert (apply 'format format args))
+      (insert (apply #'format format args))
       (insert "\n")
       (sit-for 0)
       ))
@@ -396,11 +393,15 @@ The rest of the ARGS are used to fill in FORMAT with `format'."
   "Test the lightening function for pulsing a line.
 When optional NO-ERROR don't throw an error if we can't run tests."
   (interactive)
-  (if (or (not pulse-flag) (not (pulse-available-p)))
+  (if (not (and (bound-and-true-p pulse-flag)
+                (fboundp 'pulse-available-p)
+                (pulse-available-p)))
       (if no-error
 	  nil
 	(error (concat "Pulse test only works on versions of Emacs"
 		       " that support pulsing")))
+    (declare-function pulse-momentary-highlight-overlay
+                      "pulse.el" (o &optional face))
     ;; Run the tests
     (when (called-interactively-p 'interactive)
       (message "<Press a key> Pulse one line.")
diff --git a/test/manual/cedet/semantic-tests.el b/test/manual/cedet/semantic-tests.el
index 3d72fa2965a..61f1d118fd2 100644
--- a/test/manual/cedet/semantic-tests.el
+++ b/test/manual/cedet/semantic-tests.el
@@ -1,4 +1,4 @@
-;;; semantic-utest.el --- Miscellaneous Semantic tests.
+;;; semantic-utest.el --- Miscellaneous Semantic tests.  -*- lexical-binding: t; -*-
 
 ;;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc.
 
@@ -64,10 +64,12 @@ run the test again")))
   "Find the first loaded ebrowse table, and dump out the contents."
   (interactive)
   (let ((db semanticdb-database-list)
-	(ab nil))
+	;; (ab nil)
+	)
     (while db
       (when (semanticdb-project-database-ebrowse-p (car db))
-	(setq ab (data-debug-new-buffer "*EBROWSE Database*"))
+	;; (setq ab
+	      (data-debug-new-buffer "*EBROWSE Database*") ;;)
 	(data-debug-insert-thing (car db) "*" "")
 	(setq db nil)
 	)
@@ -100,7 +102,7 @@ If optional arg STANDARDFILE is non-nil, use a standard file w/ global enabled."
 		 (set-buffer (find-file-noselect semanticdb-test-gnu-global-startfile)))
 	       (semanticdb-enable-gnu-global-in-buffer))))
 
-    (let* ((db (semanticdb-project-database-global "global"))
+    (let* ((db (semanticdb-project-database-global)) ;; "global"
 	   (tab (semanticdb-file-table db (buffer-file-name)))
 	   (result (semanticdb-deep-find-tags-for-completion-method tab searchfor))
 	   )
@@ -127,8 +129,7 @@ Optional argument ARG specifies not to use color."
 	(princ (car fns))
 	(princ ":\n ")
 	(let ((s (funcall (car fns) tag par (not arg))))
-	  (save-excursion
-	    (set-buffer "*format-tag*")
+	  (with-current-buffer "*format-tag*"
 	    (goto-char (point-max))
 	    (insert s)))
 	(setq fns (cdr fns))))
@@ -163,7 +164,7 @@ Optional argument ARG specifies not to use color."
   "Test `semantic-idle-scheduler-work-parse-neighboring-files' and time it."
   (interactive)
   (let ((start (current-time))
-	(junk (semantic-idle-scheduler-work-parse-neighboring-files)))
+	(_junk (semantic-idle-scheduler-work-parse-neighboring-files)))
     (message "Work took %.2f seconds." (semantic-elapsed-time start nil))))
 
 ;;; From semantic-lex:
@@ -210,6 +211,8 @@ Analyze the area between BEG and END."
     (semantic-lex-spp-table-write-slot-value
      (semantic-lex-spp-save-table))))
 
+(defvar cedet-utest-directory) ;From test/manual/cedet/cedet-utests.el?
+
 (defun semantic-lex-spp-write-utest ()
   "Unit test using the test spp file to test the slot write fcn."
   (interactive)
@@ -258,7 +261,7 @@ tag that contains point, and return that."
 	 (Lcount 0))
     (when (semantic-tag-p target)
       (semantic-symref-hits-in-region
-       target (lambda (start end prefix) (setq Lcount (1+ Lcount)))
+       target (lambda (_start _end _prefix) (setq Lcount (1+ Lcount)))
        (semantic-tag-start tag)
        (semantic-tag-end tag))
       (when (called-interactively-p 'interactive)
diff --git a/test/manual/image-circular-tests.el b/test/manual/image-circular-tests.el
index 3d1d23234b7..7abb94dee6e 100644
--- a/test/manual/image-circular-tests.el
+++ b/test/manual/image-circular-tests.el
@@ -1,4 +1,4 @@
-;;; image-circular-tests.el --- test image functions with circular objects
+;;; image-circular-tests.el --- test image functions with circular objects  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2019, 2021 Free Software Foundation, Inc.
 
diff --git a/test/manual/image-size-tests.el b/test/manual/image-size-tests.el
index 489b3972932..f7c2bf7fc0d 100644
--- a/test/manual/image-size-tests.el
+++ b/test/manual/image-size-tests.el
@@ -1,4 +1,4 @@
-;;; image-size-tests.el -- tests for image scaling
+;;; image-size-tests.el -- tests for image scaling  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2017-2021 Free Software Foundation, Inc.
 
@@ -45,7 +45,8 @@
          (= (cdr size) height))))
 
 (defun image-size-tests ()
-  (unless (imagemagick-types)
+  (unless (and (fboundp 'imagemagick-types)
+               (imagemagick-types))
     (error "This only makes sense if ImageMagick is installed"))
   ;; Test the image that's wider than it is tall.
   ;; Default sizes.
diff --git a/test/manual/redisplay-testsuite.el b/test/manual/redisplay-testsuite.el
index 48f3788b54e..8e90f2d7a5c 100644
--- a/test/manual/redisplay-testsuite.el
+++ b/test/manual/redisplay-testsuite.el
@@ -1,4 +1,4 @@
-;;; redisplay-testsuite.el --- Test suite for redisplay.
+;;; redisplay-testsuite.el --- Test suite for redisplay.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2009-2021 Free Software Foundation, Inc.