mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from savannah/emacs-30

Browse source 
5ec73eca57 Update to Org 9.7.7-2-gf308d3
33ba72f52f Fix decoding 'display' properties with SVG images in Enri...
174a0b7642 * configure.ac (D8): Fix typo.
c56e837a10 ; * src/android.c (setEmacsParams): Delete unused variable.
This commit is contained in:
Po Lu 2024-07-15 21:12:01 +08:00
commit 46f2c94949
10 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/textmodes/enriched.el
View file

@ -453,7 +453,12 @@ Any \"<<\" strings encountered are converted to \"<\".
Return value is \(begin end name positive-p), or nil if none was found."
(while (and (search-forward "<" nil 1)
(progn (goto-char (match-beginning 0))
(not (looking-at enriched-annotation-regexp))))
;; Make sure we are not inside a string, where any
;; matches for 'enriched-annotation-regexp' are
;; false positives. This happens, for example, in
;; display properties that specify SVG images.
(or (nth 3 (syntax-ppss))
(not (looking-at enriched-annotation-regexp)))))
(forward-char 1)
(if (eq ?< (char-after (point)))
(delete-char 1)