Screenshots: Lars squashed those two patches and applied them to elpa.git. Before bumping the version number (and therefore releasing a new version), it'd be great if people could either 1. review the patches some more: e.g. does the logic in adaptive-wrap--prefix-face sound OK, or is it completely bonkers? 2. try the changes and tell us if something broke horribly; if you don't have elpa.git cloned, you can get the latest adaptive-wrap.el here: https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/packages/adaptive-wrap/adaptive-wrap.el Then run emacs -L /path/to/adaptive-wrap-dir. Thanks in advance for your help.