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

diff --git a/dot/emacs b/dot/emacs
index a7ac91d..d918bcd 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -134,7 +134,9 @@
 		  edit-server-new-frame nil
 		  gnuserv-frame t)
 	    (trap (let ((warning-suppress-types
-			 (cons '(server) warning-suppress-types)))
+			 (cons '(server)
+			       (and (boundp 'warning-suppress-types)
+				    warning-suppress-types))))
 		    (server-start)))
 	    (trap (progn
 		    (require 'edit-server)
@@ -371,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)
@@ -577,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)
@@ -618,20 +621,31 @@
   (windmove-default-keybindings))
 (setq windmove-wrap-around t)
 (trap (require 'ido) (ido-mode 1)
-      (require 'ido-ubiquitous) (ido-ubiquitous-mode 1)
-      (setq ido-cr+-max-items nil
-	    ido-ubiquitous-command-overrides
-	    (append ido-ubiquitous-command-overrides
-		    `((enable-old regexp ,(concat "\\`"
-						  "gtags-find-"
-						  "\\("    "tag"
-							"\\|file"
-							"\\|rtag"
-							"\\|symbol"
-						  "\\)"
-						  "\\("	"\\|-other-window"
-						  "\\)"
-						  "\\'")))))
+      (require 'ido-completing-read+)
+      (unless (fboundp 'ido-ubiquitous-mode) (require 'ido-ubiquitous))
+      (ido-ubiquitous-mode 1)
+      (setq ido-cr+-max-items nil)
+      (let ((excludes `(,(concat "\\`"
+				 "gtags-find-"
+				 "\\("    "tag"
+				       "\\|file"
+				       "\\|rtag"
+				       "\\|symbol"
+				 "\\)"
+				 "\\("	"\\|-other-window"
+				 "\\)"
+				 "\\'"))))
+	(if (boundp 'ido-ubiquitous-command-overrides)
+	    (setq ido-ubiquitous-command-overrides
+		  (append ido-ubiquitous-command-overrides
+			  (mapcar (lambda (exclude)
+				    (if (symbolp exclude)
+					`(enable-old exact
+						     ,(symbol-name exclude))
+				      `(enable-old regexp ,exclude)))
+				  excludes)))
+	  (setq ido-cr+-function-blacklist
+		(append ido-cr+-function-blacklist excludes))))
       (setq magit-completing-read-function 'magit-ido-completing-read)
       (require 'smex) (smex-initialize) (global-set-key [?\M-x] 'smex))