X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8845865d1537d50dd26cec61f181f39ff14e6928..36b8c929e3c25f4f17cedba623ea4a5325014942:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 8aff2b9..c6c038c 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
@@ -3513,9 +3526,7 @@ that character only to be normal punctuation.")
 (mdw-define-face eshell-ls-readonly (t nil))
 (mdw-define-face eshell-ls-symlink (t :foreground "cyan"))
 
-(defun mdw-eshell-hack ()
-  (when mdw-preload-hacks
-    (setenv "LD_PRELOAD" nil)))
+(defun mdw-eshell-hack () (setenv "LD_PRELOAD" nil))
 (add-hook 'eshell-mode-hook 'mdw-eshell-hack)
 
 ;;;--------------------------------------------------------------------------
@@ -3931,6 +3942,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)