From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 7 Nov 2012 11:22:30 +0000 (+0000)
Subject: Merge branch 'master' of git://git.distorted.org.uk/~mdw/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/6776087a15aa3844aef99c6d962984973b05fa56?hp=-c

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

* 'master' of git://git.distorted.org.uk/~mdw/profile:
  dot/emacs: Fix `@BASH@' entry in `interpreter-mode-alist'.
  dot/xinitrc, dot/xmodmap, setup: Configure keyboard using xmodmap files.
  dot/emacs: Longer logs by default in Magit.
  dot/emacs: Recognize `@BASH@' in shebang lines.
  el/dot-emacs.el: Apply reStructuredText face settings after load.
  el/dot-emacs.el: Define some faces for reStructuredText.
  el/dot-emacs.el (mdw-fontify-pythonic): Handle word boundaries better.
  el/dot-emacs.el: Magit colouring.
  dot/emacs: Some imenu tweaking.
  dot/emacs: Have Message use the From header as the envelope sender.
---

6776087a15aa3844aef99c6d962984973b05fa56
diff --combined el/dot-emacs.el
index 2fb88e7,ed1103a..20978de
--- 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,6 -989,21 +989,21 @@@
  (mdw-define-face woman-italic
    (t :slant italic))
  
+ (eval-after-load "rst"
+   '(progn
+      (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
@@@ -999,11 -1023,6 +1023,11 @@@
  (mdw-define-face p4-diff-ins-face
    (t :foreground "green"))
  
 +(mdw-define-face w3m-anchor-face
 +  (t :foreground "SkyBlue1" :underline t))
 +(mdw-define-face w3m-arrived-anchor-face
 +  (t :foreground "SkyBlue1" :underline t))
 +
  (mdw-define-face whizzy-slice-face
    (t :background "grey10"))
  (mdw-define-face whizzy-error-face
@@@ -1672,12 -1691,12 +1696,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))