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

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 5314fd9..c46143c 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
@@ -3966,6 +3979,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.