From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 17 Jun 2016 10:23:00 +0000 (+0100)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/652ff1add948209b4d55f461b04c5d54d1d8ad7b?hp=fe6373b29179fbff33a4708b390bcf8ed7d632cd

Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile:
  el/dot-emacs.el: Better fontification for Ediff.
  dot/emacs: Set new variable for Python indent level.
  setup: Just symlink all of the backgrounds.
  bg/twins.jpg: The Twins: Kate and Grace Hoare, by John Everett Millais.
  dot/gnus-local.el.distorted: Changes to support later Gnus versions.
---

diff --git a/bg/twins.jpg b/bg/twins.jpg
new file mode 100644
index 0000000..0d5bbb5
Binary files /dev/null and b/bg/twins.jpg differ
diff --git a/dot/emacs b/dot/emacs
index 648c562..5c567fa 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -828,6 +828,7 @@
 (progn
   (setq-default py-indent-offset 2
 		python-indent 2
+		python-indent-offset 2
 		py-python-command-args
 		`("-i" "-colors" ,(if mdw-black-background
 				      "Linux" "LightBG")))
diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 466296c..82cc344 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -5,6 +5,8 @@
 ;;; (c) 2014 Mark Wooding
 ;;;
 
+(setq auth-sources '("~/.gnus.authinfo"))
+
 ;;;--------------------------------------------------------------------------
 ;;; How to send mail.
 
@@ -55,19 +57,27 @@
       '((nnimap "distorted"
 		(nnimap-address "mail.distorted.org.uk")
 		(nnimap-stream tls)
-		(nnimap-authinfo-file "~/.gnus.authinfo"))
+		(nnimap-authinfo-file "~/.gnus.authinfo")
+		(nnimap-inbox "INBOX")
+		(nnimap-unsplittable-articles (%Deleted)))
 	(nnimap "markw-distorted"
 		(nnimap-address "mail.distorted.org.uk")
 		(nnimap-stream tls)
-		(nnimap-authinfo-file "~/.gnus.authinfo.markw"))
+		(nnimap-authinfo-file "~/.gnus.authinfo.markw")
+		(nnimap-inbox "INBOX")
+		(nnimap-unsplittable-articles (%Deleted)))
 	(nnimap "mwooding-chiark"
 		(nnimap-address "imap.dovecot.chiark.greenend.org.uk")
 		(nnimap-stream tls)
-		(nnimap-authinfo-file "~/.gnus.authinfo"))
+		(nnimap-authinfo-file "~/.gnus.authinfo")
+		(nnimap-inbox "INBOX")
+		(nnimap-unsplittable-articles (%Deleted)))
 	(nnimap "google"
 		(nnimap-address "imap.gmail.com")
 		(nnimap-stream tls)
-		(nnimap-authinfo-file "~/.gnus.authinfo"))))
+		(nnimap-authinfo-file "~/.gnus.authinfo")
+		(nnimap-inbox "INBOX")
+		(nnimap-unsplittable-articles (%Deleted)))))
 
 ;; Send sent mail back to me.
 (setq gnus-message-archive-method "mail"
diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 3b4ec21..d83057a 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1374,6 +1374,52 @@ (mdw-define-face diff-refine-added
   (((class color) (type x)) :background "#050")
   (t :underline t))
 
+(setq ediff-force-faces t)
+(mdw-define-face ediff-current-diff-A
+  (((class color) (type x)) :background "darkred")
+  (((class color) (type tty)) :background "red")
+  (t :inverse-video t))
+(mdw-define-face ediff-fine-diff-A
+  (((class color) (type x)) :background "red3")
+  (((class color) (type tty)) :inverse-video t)
+  (t :inverse-video nil))
+(mdw-define-face ediff-even-diff-A
+  (((class color) (type x)) :background "#300"))
+(mdw-define-face ediff-odd-diff-A
+  (((class color) (type x)) :background "#300"))
+(mdw-define-face ediff-current-diff-B
+  (((class color) (type x)) :background "darkgreen")
+  (((class color) (type tty)) :background "magenta")
+  (t :inverse-video t))
+(mdw-define-face ediff-fine-diff-B
+  (((class color) (type x)) :background "green4")
+  (((class color) (type tty)) :inverse-video t)
+  (t :inverse-video nil))
+(mdw-define-face ediff-even-diff-B
+  (((class color) (type x)) :background "#020"))
+(mdw-define-face ediff-odd-diff-B
+  (((class color) (type x)) :background "#020"))
+(mdw-define-face ediff-current-diff-C
+  (((class color) (type x)) :background "darkblue")
+  (((class color) (type tty)) :background "blue")
+  (t :inverse-video t))
+(mdw-define-face ediff-fine-diff-C
+  (((class color) (type x)) :background "blue1")
+  (((class color) (type tty)) :inverse-video t)
+  (t :inverse-video nil))
+(mdw-define-face ediff-even-diff-C
+  (((class color) (type x)) :background "#004"))
+(mdw-define-face ediff-odd-diff-C
+  (((class color) (type x)) :background "#004"))
+(mdw-define-face ediff-current-diff-Ancestor
+  (((class color) (type x)) :background "#630")
+  (((class color) (type tty)) :background "blue")
+  (t :inverse-video t))
+(mdw-define-face ediff-even-diff-Ancestor
+  (((class color) (type x)) :background "#320"))
+(mdw-define-face ediff-odd-diff-Ancestor
+  (((class color) (type x)) :background "#320"))
+
 (mdw-define-face dylan-header-background
   (((class color) (type x)) :background "NavyBlue")
   (t :background "blue"))
diff --git a/setup b/setup
index 057a1ba..37dc474 100755
--- a/setup
+++ b/setup
@@ -229,17 +229,7 @@ done
 echo "  all done."
 
 ## Symlink backgrounds.
-backgrounds="
-  bsg-supper.jpg
-  harley-quinn.jpg
-  hypatia.jpg
-  jue-peek.jpg
-  lilith.jpg
-  lovelace.jpg
-  medusa.jpg
-  noodly.jpg
-  rayne.jpg
-"
+backgrounds=$(cd bg && echo *)
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."
   for b in $backgrounds; do