X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5d824e2fc0f7bb18c222539ce4cb2785c5a66d9e..3db66f7bde00ac99a42187eb6d1bc75ddd5bfd66:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index c46143c..75f3dae 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -730,7 +730,7 @@ Use this to arrange for per-server settings.")
     proc))
 
 (eval-after-load "erc"
-    '(load "~/.ercrc.el"))
+  '(load "~/.ercrc.el"))
 
 ;;;--------------------------------------------------------------------------
 ;;; Utility functions.
@@ -920,7 +920,8 @@ If NEW-SESSION-P, start a new session."
 	(select-window window)))))
 
 (defvar mdw-good-url-browsers
-  '(browse-url-mozilla
+  '(browse-url-chromium
+    browse-url-mozilla
     browse-url-generic
     (w3m . mdw-w3m-browse-url)
     browse-url-w3)
@@ -1009,10 +1010,6 @@ It in turn is a list of things:
   "*Standard regexp matching parts of a hanging indent.
 This is mainly useful in `auto-fill-mode'.")
 
-;; Setting things up.
-
-(fset 'mdw-do-auto-fill (symbol-function 'do-auto-fill))
-
 ;; Utility functions.
 
 (defun mdw-maybe-tabify (s)
@@ -1030,11 +1027,11 @@ This is mainly useful in `auto-fill-mode'.")
 context and return the static fill prefix to use.  Point must be
 at the start of a line, and match data must be saved."
   (cond ((not l) nil)
-	       ((looking-at (car (car l)))
-		(mdw-maybe-tabify (apply #'concat
-					 (mapcar #'mdw-do-prefix-match
-						 (cdr (car l))))))
-	       (t (mdw-examine-fill-prefixes (cdr l)))))
+	((looking-at (car (car l)))
+	 (mdw-maybe-tabify (apply #'concat
+				  (mapcar #'mdw-do-prefix-match
+					  (cdr (car l))))))
+	(t (mdw-examine-fill-prefixes (cdr l)))))
 
 (defun mdw-maybe-car (p)
   "If P is a pair, return (car P), otherwise just return P."
@@ -1053,26 +1050,26 @@ at the start of a line, and match data must be saved."
   "Expand a dynamic prefix match element.
 See `mdw-fill-prefix' for details."
   (cond ((not (consp m)) (format "%s" m))
-	   ((eq (car m) 'match) (match-string (mdw-maybe-car (cdr m))))
-	   ((eq (car m) 'pad) (mdw-padding (match-string
-					    (mdw-maybe-car (cdr m)))))
-	   ((eq (car m) 'eval) (eval (cdr m)))
-	   (t "")))
+	((eq (car m) 'match) (match-string (mdw-maybe-car (cdr m))))
+	((eq (car m) 'pad) (mdw-padding (match-string
+					 (mdw-maybe-car (cdr m)))))
+	((eq (car m) 'eval) (eval (cdr m)))
+	(t "")))
 
 (defun mdw-choose-dynamic-fill-prefix ()
   "Work out the dynamic fill prefix based on the variable `mdw-fill-prefix'."
   (cond ((and fill-prefix (not (string= fill-prefix ""))) fill-prefix)
-	   ((not mdw-fill-prefix) fill-prefix)
-	   (t (save-excursion
-		(beginning-of-line)
-		(save-match-data
-		  (mdw-examine-fill-prefixes mdw-fill-prefix))))))
+	((not mdw-fill-prefix) fill-prefix)
+	(t (save-excursion
+	     (beginning-of-line)
+	     (save-match-data
+	       (mdw-examine-fill-prefixes mdw-fill-prefix))))))
 
-(defun do-auto-fill ()
+(defadvice do-auto-fill (around mdw-dynamic-fill-prefix () activate compile)
   "Handle auto-filling, working out a dynamic fill prefix in the
 case where there isn't a sensible static one."
   (let ((fill-prefix (mdw-choose-dynamic-fill-prefix)))
-    (mdw-do-auto-fill)))
+    ad-do-it))
 
 (defun mdw-fill-paragraph ()
   "Fill paragraph, getting a dynamic fill prefix."
@@ -1086,9 +1083,9 @@ This is just a short-cut for setting the thing by hand, and by
 design it doesn't cope with anything approximating a complicated
 case."
   (setq mdw-fill-prefix
-	   `((,(concat rx mdw-hanging-indents)
-	      (match . 1)
-	      (pad . ,(or mat 2))))))
+	`((,(concat rx mdw-hanging-indents)
+	   (match . 1)
+	   (pad . ,(or mat 2))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other common declarations.
@@ -1548,6 +1545,18 @@ doesn't match any of the regular expressions in
 (mdw-define-face magit-diff-removed-highlight
   (((min-colors 64)) :foreground "#eecccc" :background "#663333")
   (((class color)) :foreground "red" :background "blue"))
+(mdw-define-face magit-blame-heading
+  (((min-colors 64)) :foreground "white" :background "grey25"
+		     :weight normal :slant normal)
+  (((class color)) :foreground "white" :background "blue"
+		   :weight normal :slant normal))
+(mdw-define-face magit-blame-name
+  (t :inherit magit-blame-heading :slant italic))
+(mdw-define-face magit-blame-date
+  (((min-colors 64)) :inherit magit-blame-heading :foreground "grey60")
+  (((class color)) :inherit magit-blame-heading :foreground "cyan"))
+(mdw-define-face magit-blame-summary
+  (t :inherit magit-blame-heading :weight bold))
 
 (mdw-define-face dylan-header-background
   (((min-colors 64)) :background "NavyBlue")
@@ -3366,6 +3375,9 @@ strip numbers instead."
 	   (unless modified
 	     (restore-buffer-modified-p nil)))))))
 
+(setq LaTeX-syntactic-comments nil
+      LaTeX-fill-break-at-separators '(\\\[))
+
 ;;;--------------------------------------------------------------------------
 ;;; SGML hacking.