X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b1a598dcf29dc311aacc9b13e9a0dc3ee0916341..02a961ceca4c4f94dec705a548ab95686d34629b:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index c24d9ec..6930bda 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
@@ -463,7 +476,6 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'."
 	     "\\documentclass{strayman}
 \\usepackage[utf8]{inputenc}
 \\usepackage[palatino, helvetica, courier, maths=cmr]{mdwfonts}
-\\usepackage[T1]{fontenc}
 \\usepackage{graphicx, tikz, mdwtab, mdwmath, crypto, longtable}"
 	     ("\\section{%s}" . "\\section*{%s}")
 	     ("\\subsection{%s}" . "\\subsection*{%s}")
@@ -717,7 +729,7 @@ Use this to arrange for per-server settings.")
     proc))
 
 (eval-after-load "erc"
-    '(load "~/.ercrc.el"))
+  '(load "~/.ercrc.el"))
 
 ;;;--------------------------------------------------------------------------
 ;;; Utility functions.
@@ -907,7 +919,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)
@@ -996,10 +1009,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)
@@ -1017,11 +1026,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."
@@ -1040,26 +1049,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."
@@ -1073,9 +1082,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.
@@ -1535,6 +1544,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")
@@ -3353,6 +3374,9 @@ strip numbers instead."
 	   (unless modified
 	     (restore-buffer-modified-p nil)))))))
 
+(setq LaTeX-syntactic-comments nil
+      LaTeX-fill-break-at-separators '(\\\[))
+
 ;;;--------------------------------------------------------------------------
 ;;; SGML hacking.
 
@@ -3929,6 +3953,10 @@ This allows you to pass a list of arguments through `ansi-term'."
 			   magit-revision-mode-refresh-popup))
 	    (magit-define-popup-switch popup ?R "Reverse diff" "-R"))))
 
+(defadvice magit-wip-commit-buffer-file
+    (around mdw-just-this-buffer activate compile)
+  (let ((magit-save-repository-buffers nil)) ad-do-it))
+
 (setq magit-repolist-columns
       '(("Name" 16 magit-repolist-column-ident nil)
 	("Version" 18 magit-repolist-column-version nil)
@@ -3962,6 +3990,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.