diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-12-07 06:30:51 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-12-07 06:30:51 +0100 |
| commit | 82849f9a20bcc043b23c59905044b7f69d8f54a1 (patch) | |
| tree | 7d2dd764b5cc1193d652b89ab30b8de7eaf4bf29 /lisp/emacs-lisp/subr-x.el | |
| parent | f0e118d3f676afe39df29663399d4bbe8f53f208 (diff) | |
| parent | 9ae1c2762d7f42a775e7623d9676ce4f7fa3c8f2 (diff) | |
| download | emacs-82849f9a20bcc043b23c59905044b7f69d8f54a1.tar.gz emacs-82849f9a20bcc043b23c59905044b7f69d8f54a1.tar.bz2 emacs-82849f9a20bcc043b23c59905044b7f69d8f54a1.zip | |
Merge from origin/emacs-29
9ae1c2762d7 EUDC: Outline deprecation plans in NEWS
6acf95cbea6 Fix admin/notes/tree-sitter/build-module/build.sh (bug#59...
cc63c086971 * doc/misc/eww.texi (Overview): Improve introduction.
b8790e320e1 Consistent fontification of using-directives in csharp-ts...
5257b9cda43 ; Rename c-ts-fontify-error to c-ts-mode--fontify-error
c6b454df339 ; Improve docstring of c-ts-mode--fontify-variable
6187d001f28 Fontify some keywords in type face in c-ts-mode
b3847c02083 ; Minor cleanup in treesit.c
40af27859e0 ; * lib-src/etags.c (escape_shell_arg_string): Minor doc ...
43b7e7efbf4 Fix etags builds on non-Windows non-MS-DOS machines
7e6d1d1c471 ; Fix last change in etags.c.
01a4035c869 Fix etags local command injection vulnerability
ed4734405df Avoid crashes in a build --without-modules
70a2eb4a0b3 Fix 'add-display-text-property' when OBJECT is non-nil
d58d1dd48ac Do not run slow tests on EMBA
9b9b39a2d89 Lisp reader undefined behaviour excision
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp/subr-x.el')
| -rw-r--r-- | lisp/emacs-lisp/subr-x.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el index 18087bc937f..0486baba83c 100644 --- a/lisp/emacs-lisp/subr-x.el +++ b/lisp/emacs-lisp/subr-x.el @@ -370,7 +370,8 @@ this defaults to the current buffer." (min end (point-max))))) (if (not (setq disp (get-text-property sub-start 'display object))) ;; No old properties in this range. - (put-text-property sub-start sub-end 'display (list prop value)) + (put-text-property sub-start sub-end 'display (list prop value) + object) ;; We have old properties. (let ((vector nil)) ;; Make disp into a list. @@ -390,7 +391,7 @@ this defaults to the current buffer." (when vector (setq disp (seq-into disp 'vector))) ;; Finally update the range. - (put-text-property sub-start sub-end 'display disp))) + (put-text-property sub-start sub-end 'display disp object))) (setq sub-start sub-end)))) ;;;###autoload |