From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 3 Oct 2021 14:24:02 +0000 (+0100)
Subject: Merge remote-tracking branches 'crybaby/master', 'gibson/master' and 'mdwdev/master'
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/5c1771876cc5301c2d0c7e9e28c69a01682d2429

Merge remote-tracking branches 'crybaby/master', 'gibson/master' and 'mdwdev/master'

* crybaby/master:
  dot/swank.lisp: Only force `:fd-handler' on Lisps which can do it.
  dot/emacs: Add Viper cursor-colour flail.
  dot/emacs: Apply Viper settings as the defaults.
  dot/emacs, el/dot-emacs.el: Set up Viper mode.

* gibson/master:
  firefox/stylus/Scribd Reveal.css: Hack to override Scribd sign-in bollocks.
  firefox/stylus/*.css: New styles for Fandom and Vridar.
  el/dot-emacs.el: Add a switch for the `--rebase-merges' option.
  dot/emacs: Move the cursor properly.

* mdwdev/master:
  firefox/stylus/: Add styling for Trustonic's awful Confluence wiki.
  el/dot-emacs.el: Move the comment indentation weirdness to Alec-emulation.
---

5c1771876cc5301c2d0c7e9e28c69a01682d2429