Move buffer-local-set-state to subr because it's used at runtime

* lisp/subr.el (buffer-local-set-state)
(buffer-local-set-state--get, buffer-local-restore-state): Moved
from easy-mmode.el because they have to be available run-time.

2 files changed, 12 insertions, 12 deletions

diff --git a/test/lisp/emacs-lisp/easy-mmode-tests.el b/test/lisp/emacs-lisp/easy-mmode-tests.el
index 697bf6c2152..f6d07196727 100644
--- a/test/lisp/emacs-lisp/easy-mmode-tests.el
+++ b/test/lisp/emacs-lisp/easy-mmode-tests.el
@@ -60,16 +60,4 @@
     (easy-mmode-test-mode 'toggle)
     (should (eq easy-mmode-test-mode t))))
 
-(ert-deftest test-local-set-state ()
-  (setq global 1)
-  (with-temp-buffer
-    (setq-local local 2)
-    (let ((state (buffer-local-set-state global 10
-                                         local 20
-                                         unexist 30)))
-      (buffer-local-restore-state state)
-      (should (= global 1))
-      (should (= local 2))
-      (should-not (boundp 'unexist)))))
-
 ;;; easy-mmode-tests.el ends here
diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index 3725f180f3a..6bcac2a5eba 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -1058,5 +1058,17 @@ final or penultimate step during initialization."))
   (should (equal (kbd "C-x ( C-d C-x )") ""))
   (should (equal (kbd "C-x ( C-x )") "")))
 
+(ert-deftest test-local-set-state ()
+  (setq global 1)
+  (with-temp-buffer
+    (setq-local local 2)
+    (let ((state (buffer-local-set-state global 10
+                                         local 20
+                                         unexist 30)))
+      (buffer-local-restore-state state)
+      (should (= global 1))
+      (should (= local 2))
+      (should-not (boundp 'unexist)))))
+
 (provide 'subr-tests)
 ;;; subr-tests.el ends here