X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/cc8708fc32ad33d723fdc35d56f808068ea43e9b..6ed1b26ad20632cb62071ba056fc656bdbdd6253:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index c6c038c..0e93221 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1030,11 +1030,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,20 +1053,20 @@ 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 ()
   "Handle auto-filling, working out a dynamic fill prefix in the
@@ -1086,9 +1086,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 +1548,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")
@@ -3979,6 +3991,13 @@ there is sadness."
 	   (propertize (number-to-string n) 'face
 		       (if (> n 0) 'bold 'shadow))))))
 
+(defun mdw-try-smerge ()
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward "^<<<<<<< " nil t)
+      (smerge-mode 1))))
+(add-hook 'find-file-hook 'mdw-try-smerge t)
+
 ;;;--------------------------------------------------------------------------
 ;;; MPC configuration.