X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/353f39077f302c8e547b6c7e4d6830f4ea26ece9..00fe36a6d7cfc415d0e16e6e341ae3492286ca00:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 9dd28f2..d918bcd 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -373,7 +373,8 @@
 (setq find-ls-option			;Build file lists efficiently
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq bookmark-save-flag 0)		;Save bookmarks automatically
-(setq vc-follow-symlinks t)
+(setq vc-follow-symlinks t
+      vc-git-resolve-conflicts nil)
 (setq x-gtk-file-dialog-help-text nil)
 (setq use-dialog-box nil)
 (setq Info-fontify-maximum-menu-size 100000)
@@ -579,9 +580,9 @@
 ;; Default frame size.
 
 (setq frame-background-mode (if mdw-black-background 'dark 'light)
+      frame-inhibit-implied-resize t
       default-frame-alist
-      `((width . ,(+ mdw-column-width
-		     (if (>= emacs-major-version 21) 0 1)))
+      `((width . ,(+ mdw-column-width mdw-frame-width-fudge))
 	(height . 33)
 	(vertical-scroll-bars . right)
 	(cursor-type . bar)