tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Fix `org-string-display' 

* lisp/org-macs.el (org-string-display): Preserve original string's
  display property when computing displayed width.

* testing/lisp/test-org-macs.el (test-org/string-display): Add test.

Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00160.html>
This commit is contained in:
Nicolas Goaziou 2017-11-15 18:13:34 +01:00
parent 6059c3a057
commit 40f73953f6
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lisp/org-macs.el
View File

@ -108,16 +108,15 @@ text properties."
(value (if (stringp display) display
(cl-some #'stringp display))))
(when value
(apply
#'propertize
;; Displayed string could contain
;; invisible parts, but no nested display.
(funcall prune-invisible value)
(plist-put props
'display
(and (not (stringp display))
(cl-remove-if #'stringp
display)))))))))))
(apply #'propertize
;; Displayed string could contain
;; invisible parts, but no nested
;; display.
(funcall prune-invisible value)
'display
(and (not (stringp display))
(cl-remove-if #'stringp display))
props))))))))
;; `display' property overrides `invisible' one. So we first
;; replace characters with `display' property. Then we remove
;; invisible characters.

8
testing/lisp/test-org-macs.el
View File

@ -68,7 +68,13 @@
(eq 'foo
(get-text-property 1 'face
(org-string-display
#("123" 1 2 (display "abc" face foo)))))))
#("123" 1 2 (display "abc" face foo))))))
;; Also preserve `display' property in original string.
(should
(equal "abc"
(let ((s #("123" 1 2 (display "abc" face foo))))
(org-string-display s)
(get-text-property 1 'display s)))))
(provide 'test-org-macs)