summaryrefslogtreecommitdiff
path: root/test/lisp/emacs-lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2022-12-06 14:41:36 +0200
committerEli Zaretskii <eliz@gnu.org>2022-12-06 14:41:36 +0200
commit70a2eb4a0b315c3e66ab89508c9c62ca8b84ef29 (patch)
tree2d25b0f36981cec7fd4b39db33c5bff06b39af2b /test/lisp/emacs-lisp
parentd58d1dd48ac7ae0f0b1a7d129c8a27b4a016d1ca (diff)
downloademacs-70a2eb4a0b315c3e66ab89508c9c62ca8b84ef29.tar.gz
emacs-70a2eb4a0b315c3e66ab89508c9c62ca8b84ef29.tar.bz2
emacs-70a2eb4a0b315c3e66ab89508c9c62ca8b84ef29.zip
Fix 'add-display-text-property' when OBJECT is non-nil
* lisp/emacs-lisp/subr-x.el (add-display-text-property): Fix the case where OBJECT is not nil. (Bug#59857) * test/lisp/emacs-lisp/subr-x-tests.el (subr-x-test-add-display-text-property): Add test for this case.
Diffstat (limited to 'test/lisp/emacs-lisp')
-rw-r--r--test/lisp/emacs-lisp/subr-x-tests.el11
1 files changed, 10 insertions, 1 deletions
diff --git a/test/lisp/emacs-lisp/subr-x-tests.el b/test/lisp/emacs-lisp/subr-x-tests.el
index 7a3efe9db62..e80d2e17e8d 100644
--- a/test/lisp/emacs-lisp/subr-x-tests.el
+++ b/test/lisp/emacs-lisp/subr-x-tests.el
@@ -707,7 +707,16 @@
(should (equal (get-text-property 2 'display) '(raise 0.5)))
(should (equal (get-text-property 5 'display)
[(raise 0.5) (height 2.0)]))
- (should (equal (get-text-property 9 'display) '(raise 0.5)))))
+ (should (equal (get-text-property 9 'display) '(raise 0.5))))
+ (with-temp-buffer
+ (should (equal (let ((str "some useless string"))
+ (add-display-text-property 4 8 'height 2.0 str)
+ (add-display-text-property 2 12 'raise 0.5 str)
+ str)
+ #("some useless string"
+ 2 4 (display (raise 0.5))
+ 4 8 (display ((raise 0.5) (height 2.0)))
+ 8 12 (display (raise 0.5)))))))
(ert-deftest subr-x-named-let ()
(let ((funs ()))