master 7952dcc233: Fix compilation warnings in newer subr tests

[Lars Ingebrigtsen]

branch: master
commit 7952dcc23363b18f74203124d023b063bef359cf
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix compilation warnings in newer subr tests
    
    * test/lisp/subr-tests.el (test-local-set-state): Fix compilation
    warnings.
---
 test/lisp/subr-tests.el | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index 8f3ee66e00..89803e5ce2 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -1058,20 +1058,21 @@ final or penultimate step during initialization."))
   (should (equal (kbd "C-x ( C-d C-x )") ""))
   (should (equal (kbd "C-x ( C-x )") "")))
 
+(defvar subr-test--global)
 (ert-deftest test-local-set-state ()
-  (setq global 1)
+  (setq subr-test--global 1)
   (with-temp-buffer
-    (setq-local local 2)
-    (let ((state (buffer-local-set-state global 10
-                                         local 20
-                                         unexist 30)))
-      (should (= global 10))
-      (should (= local 20))
-      (should (= unexist 30))
+    (setq-local subr-test--local 2)
+    (let ((state (buffer-local-set-state subr-test--global 10
+                                         subr-test--local 20
+                                         subr-test--unexist 30)))
+      (should (= subr-test--global 10))
+      (should (= subr-test--local 20))
+      (should (= subr-test--unexist 30))
       (buffer-local-restore-state state)
-      (should (= global 1))
-      (should (= local 2))
-      (should-not (boundp 'unexist)))))
+      (should (= subr-test--global 1))
+      (should (= subr-test--local 2))
+      (should-not (boundp 'subr-test--unexist)))))
 
 (provide 'subr-tests)
 ;;; subr-tests.el ends here