From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 20 May 2021 18:08:06 +0000 (+0100)
Subject: Merge remote-tracking branches 'spirit', 'crybaby' and 'staging'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/ee9bdab18aab51148aa8deede892476d1989ad7b

Merge remote-tracking branches 'spirit', 'crybaby' and 'staging'

* spirit:
  firefox/stylus/stackoverflow.com.css: Add style for Stackmumble.
  firefox/stylus/wikimedia.org.css: Apply Mediawiki styling at the client side.
  firefox/stylus/tvtropes.com.css: Make the text be actually white.
  firefox/stylus/salsa.debian.org.css: Focus style changes more carefully.
  firefox/stylus/salsa.debian.org.css: Reformat the body style.
  bin/, Makefile: Add some scripts for doing stuff to remote machines.
  dot/emacs: Reconfigure PostScript printing of buffers.
  el/dot-emacs.el: Fix fontification in printouts.
  el/dot-emacs.el: Print buffers in a condensed version of Courier.
  el/dot-emacs.el: Don't print `flyspell' overlays.
  firefox/chrome-userContent.css: Remove (invisible) borders round monospace.
  firefox/chrome-userContent.css: Set headings in sans.
  firefox/searchplugins/: Add some search engine definitions.
  bin/mdw-build: Prepare for a world where `mdw-setup' doesn't exist any more.

* crybaby:
  el/dot-emacs.el: Fix `loop' indentation for older Emacsen.
  bin/hyperspec: Track changes to Emacs hyperspec internals.

* staging:
  firefox/stylus.slack.com.css: Kick Slack styling some more.
  el/dot-emacs.el: Rename the Trustonic C styles.
---

ee9bdab18aab51148aa8deede892476d1989ad7b
diff --cc dot/emacs
index 115c65a,8839993,2bb3318,2bb3318..370cfee
--- a/dot/emacs
+++ b/dot/emacs
@@@@@ -721,8 -733,6 -721,7 -721,7 +733,8 @@@@@
      (global-set-key [?\C-c ?v ?i] 'vm-visit-imap-folder)
      (global-set-key [?\C-c ?v ?m] 'vm-visit-folder)
      (global-set-key [?\C-c ?v ?v] 'mdw-auto-revert)
 +++  (global-set-key [?\C-c ?w ?b] 'w3m-bookmark-view)
 +    (global-set-key [?\C-c ?w ?c] 'mdw-set-frame-colour)
      (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
      (global-set-key [?\C-c ?w ?h] 'windmove-left)
      (global-set-key [?\C-c ?w ?j] 'windmove-down)