I can't think of a robust way to determine this color though. In these diff-mode examples, the string returned by fill-context-prefix has no properties, so we can't use that as source of truth. As demonstrated in the screenshot, we could look at the face at EOL and slap that onto the wrap prefix if it has :extend t, but I wonder if there could be situations where this heuristic would break down[1]. I'm not suggesting to apply the patch shown in the screenshots as-is[2]; I just cobbled it up to show what I'd like the wrap-prefix to look like. Let me know if any of what I wrote was unclear or confusing. I would be more than happy to work on patches for both issues; I'd just like to know what resolution people would prefer for the first issue, and what traps I should watch out for with the second issue. Thank you for your time. PS: Congratulations on the Debian inclusion ;) https://lists.debian.org/debian-devel/2020/06/msg00065.html https://salsa.debian.org/emacsen-team/adaptive-wrap-el [1] E.g. here is a line that is wrapped, ⤸ ⤹ its continuation lines indented⤸ ⤹ with 2 extra-indent spaces. If only the final chars "spaces.\n" have an :extend t face, and we naively apply (plist-get (text-properties-at (1- end)) 'face) onto the wrap prefix, I guess the overall result could look psychedelic: unardorned first line, then colored wrap-prefix, then unadorned continuation line, colored wrap-prefix again, unadorned continuation line again, then the final word, with a background that extends beyond EOL. (Maybe the answer is simply that :extend t faces are generally applied to the whole line, and we shouldn't worry about such hypothetical situations… Those sound like famous-last-words material though.) (I tried to materialize this hypothetical bug, to no avail.) [2] Though here it is if anyone wants to comment: