From: Mark Wooding <mwooding@good.com>
Date: Thu, 25 Oct 2012 11:48:59 +0000 (+0100)
Subject: Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/d228b8c4cea20ac3e8ebe2735e891d1459865016?ds=inline;hp=-c

Merge branch 'master' of git.distorted.org.uk/~mdw/profile

* 'master' of http://git.distorted.org.uk/~mdw/profile:
  el/dot-emacs.el: Magit colouring.
  dot/emacs: Some imenu tweaking.
  dot/emacs: Have Message use the From header as the envelope sender.
  dot/bash_profile: Eliminate the already-run guard.
  dot/ercrc.el: New IRC command `/GREET' to greet robots.
  dot/ercrc.el: New definitions for distorted.org.uk IRC server.
  dot/mykermrc.in: Useful commands for dealing with server consoles.
  dot/ercrc.el: Add an extra entry for chiark via greenend VPN.
---

d228b8c4cea20ac3e8ebe2735e891d1459865016
diff --combined el/dot-emacs.el
index 4f47478,3261f9e..2902ac1
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@@ -972,6 -972,15 +972,15 @@@ doesn't match any of the regular expres
    (((class color) (type x)) :background "RoyalBlue4")
    (t :underline t))
  
+ (mdw-define-face magit-diff-add
+   (t :foreground "green"))
+ (mdw-define-face magit-diff-del
+   (t :foreground "red"))
+ (mdw-define-face magit-diff-file-header
+   (t :weight bold))
+ (mdw-define-face magit-diff-hunk-header
+   (t :foreground "SkyBlue1"))
+ 
  (mdw-define-face erc-input-face
    (t :foreground "red"))
  
@@@ -980,19 -989,6 +989,19 @@@
  (mdw-define-face woman-italic
    (t :slant italic))
  
 +(mdw-define-face rst-level-1-face
 +  (t :foreground "SkyBlue1" :weight bold))
 +(mdw-define-face rst-level-2-face
 +  (t :foreground "SeaGreen1" :weight bold))
 +(mdw-define-face rst-level-3-face
 +  (t :weight bold))
 +(mdw-define-face rst-level-4-face
 +  (t :slant italic))
 +(mdw-define-face rst-level-5-face
 +  (t :underline t))
 +(mdw-define-face rst-level-6-face
 +  ())
 +
  (mdw-define-face p4-depot-added-face
    (t :foreground "green"))
  (mdw-define-face p4-depot-branch-op-face
@@@ -1680,12 -1676,12 +1689,12 @@@ strip numbers instead.
  	(list
  
  	 ;; Set up the keywords defined above.
 -	 (list (concat "\\<\\(" keywords "\\)\\>")
 +	 (list (concat "\\_<\\(" keywords "\\)\\_>")
  	       '(0 font-lock-keyword-face))
  
  	 ;; At least numbers are simpler than C.
 -	 (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
 -		       "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
 +	 (list (concat "\\_<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
 +		       "\\_<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
  		       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|[lL]\\|\\)")
  	       '(0 mdw-number-face))