Merge branch 'maint'

This commit is contained in:
Marco Wahl 2019-12-31 12:43:32 +01:00
commit bcf1187baf
1 changed files with 3 additions and 1 deletions

View File

@ -16875,7 +16875,9 @@ buffer boundaries with possible narrowing."
(overlay-put
ov 'modification-hooks
(list 'org-display-inline-remove-overlay))
(overlay-put ov 'keymap image-map)
(when (<= 26 emacs-major-version)
(cl-assert (boundp 'image-map))
(overlay-put ov 'keymap image-map))
(push ov org-inline-image-overlays))))))))))))))))
(defun org-display-inline-remove-overlay (ov after _beg _end &optional _len)