2 files changed, 42 insertions, 3 deletions

diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 5f534ed513a..f4654e90bce 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -1060,7 +1060,9 @@ should evaporate overlays in both."
       (should-length 2 (overlays-in 1 (point-max)))
       (should-length 1 (overlays-in (point-max) (point-max)))
       (narrow-to-region 1 50)
-      (should-length 1 (overlays-in 1 (point-max)))
+      ;; We only count empty overlays in narrowed buffers excluding the
+      ;; real EOB when the region is confined to `point-max'.
+      (should-length 0 (overlays-in 1 (point-max)))
       (should-length 1 (overlays-in (point-max) (point-max))))))
 
 
@@ -8375,8 +8377,11 @@ dicta sunt, explicabo.  "))
     (should (= (length (overlays-in 1 2)) 0))
     (narrow-to-region 1 2)
     ;; We've now narrowed, so the zero-length overlay is at the end of
-    ;; the (accessible part of the) buffer.
-    (should (= (length (overlays-in 1 2)) 1))
+    ;; the (accessible part of the) buffer, but we only count it when
+    ;; the region is confined to `point-max'.
+    (should (= (length (overlays-in 1 2)) 0))
+    (should (= (length (overlays-in 2 2)) 1))
+    (should (= (length (overlays-in (point-max) (point-max))) 1))
     (remove-overlays)
     (should (= (length (overlays-in (point-min) (point-max))) 0))))
 
diff --git a/test/src/data-tests.el b/test/src/data-tests.el
index 0540a99f4c3..2fc971d0214 100644
--- a/test/src/data-tests.el
+++ b/test/src/data-tests.el
@@ -951,4 +951,38 @@ comparing the subr with a much slower Lisp implementation."
     (should-error (aset s 3 #x3fff80))) ; new char not ASCII
   )
 
+(ert-deftest data-tests-per-buffer-var-predicates ()
+  (with-temp-buffer
+    ;; per buffer variable without predicate
+    (progn
+      (setq line-spacing 2.3)
+      (should (= line-spacing 2.3))
+      (setq line-spacing "2.3")
+      (should (equal line-spacing "2.3"))
+      (setq line-spacing nil)
+      (should (equal line-spacing nil)))
+    ;; per buffer variable with 'fraction predicate
+    (progn
+      (dolist (v '(nil 0.7))
+        (setq scroll-up-aggressively v)
+        (should (equal scroll-up-aggressively v)))
+      (should-error (setq scroll-up-aggressively 'abc)
+                    :type 'wrong-type-argument)
+      (should-error (setq scroll-up-aggressively 2.7))
+      (should (equal scroll-up-aggressively 0.7)))
+    ;; per buffer variable with 'vertical-scroll-bar predicate
+    (progn
+      (dolist (v (get 'vertical-scroll-bar 'choice))
+        (setq vertical-scroll-bar v)
+        (should (equal vertical-scroll-bar v)))
+      (should-error (setq vertical-scroll-bar 'foo))
+      (should (equal vertical-scroll-bar 'right)))
+    ;; per buffer variable with 'overwrite-mode predicate
+    (progn
+      (dolist (v (get 'overwrite-mode 'choice))
+        (setq overwrite-mode v)
+        (should (equal overwrite-mode v)))
+      (should-error (setq overwrite-mode 'foo))
+      (should (equal overwrite-mode 'overwrite-mode-binary)))))
+
 ;;; data-tests.el ends here