Updates from my fork. smerge-tool, magit, notmuch

[AdeAttwood]

I forked this project a while ago to add smerge-tool support that then turned into adding some more stuff and I thought it better see if you wanted any of the changes upstream.

I have been using these changes in my config using base16 shell and mostly the base16_tomorrow theme and occasionally base16_tomorrow-night .

Smerge and Magit

Changes the diffs to have the background colour as the default color, then the foreground colour to be the added or removed color (red or green). Before, the faces were not set, and I was getting the background as some random purple color.

Notmuch

Support for this was not implemented. This mainly gets rid of the bright green foreground color that was quite unreadable.

[belak]

Sorry for the delay! We're working on moving some base16 repos to a common place and I missed this. I'm happy to merge this, but is there any chance you have before/after screenshots?

[AdeAttwood]

So while doing a before and after on the packages, it looks like things have changed with all the diff faces. I don't think the smerge and magit commits are relevant any more, the before is better. The notmuch is still looking OK though, don't know if you want to cherry-pick in the notmuch commit, or you want me to amend the PR.

Smerge

Before

After

Notmuch

Before

After

Let me know what you think, I am happy with either 👍

[belak]

I've applied the notmuch patch for now - I'm a bit conflicted on diffs (in regards to base16) because there's not a light green available, which makes it hard to style diffs properly, so I'm holding off on that for now.

[AdeAttwood]

That's cool, there was some funny stuff going on with the before and afters on the smerge patches. This PR can be closed now 👍

[ooglyhLL]

Could the diff and smerge issue perhaps be addressed by synthesizing a lighter variant with functions from color.el? While not strictly base16 anymore, it might serve the purpose for that specific use case.

[belak]

I experimented with this a few years back, but I was never sure what to do with it, since lighten/darken doesn't work in the terminal.

I have a feeling this may be something which gets addressed when the org finalizes ansi16 (which would have a light and dark green/red) and/or base17 (which will probably be a different set of themes which don't support the terminal, so we can be a little more adventurous with the colors).