X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/28509f06a05e2a8684c65cb79d7590312e657d85..857045c69577e5eda802178eeb5cb20c3182b68c:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 5314fd9..db360e1 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -217,6 +217,19 @@ fringes is not taken out of the allowance for WIDTH, unlike
       (other-window 1))
     (select-window win)))
 
+(defun mdw-set-frame-width (columns &optional width)
+  (interactive "nColumns: 
+P")
+  (setq width (cond (width (prefix-numeric-value width))
+		    ((and window-system (mdw-emacs-version-p 22))
+		     mdw-column-width)
+		    (t (1+ mdw-column-width))))
+  (let ((sb-width (mdw-horizontal-window-overhead)))
+    (set-frame-width (selected-frame)
+		     (- (* columns (+ width sb-width))
+			sb-width))
+    (mdw-divvy-window width)))
+
 ;; Don't raise windows unless I say so.
 
 (defvar mdw-inhibit-raise-frame nil
@@ -1535,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")
@@ -3966,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.