Skip to content

Commit

Permalink
#49 Fix merge problem
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Zawada authored and Tobias Zawada committed Feb 8, 2024
1 parent 082a563 commit d757c1f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion adoc-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -1847,7 +1847,7 @@ TEXTPROPS is an additional plist with textproperties."
`(lambda (end) (adoc-kwf-std end ,(adoc-re-inline-macro cmd-name nil unconstrained attribute-list-constraints) '(1 2 4 5) '(0)))
`(0 '(face nil . ,textprops) t)
`(1 '(face ,(or cmd-face adoc-command-face) adoc-reserved t adoc-flyspell-ignore t) t) ; cmd-name
'(2 '(face adoc-meta-face adoc-reserved t. ,textprops) t) ; :
'(2 '(face adoc-meta-face adoc-reserved t . ,textprops) t) ; :
`(3 (list 'face
,(cond
((not target-faces) adoc-meta-face) ; target
Expand Down

0 comments on commit d757c1f

Please sign in to comment.