X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/33a8812f3c7670852d9f8f91e315d91b195da24b..eef6be35771d171e4cb89fd9fd94ec5b41f1dac4:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 978cf3a..a0ceee5 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -130,11 +130,14 @@
 
 (and (or window-system (mdw-emacs-version-p 23))
      (not mdw-fast-startup)
+     (not (and (fboundp 'daemonp) (daemonp)))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 		  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)
@@ -218,6 +221,7 @@
       bbdb-north-american-phone-numbers-p nil
       bbdb-dwim-net-address-allow-redundancy t
       bbdb-extract-address-components-func 'bbdb-extract-address-components
+      bbdb-allow-duplicates t
       bbdb/news-auto-create-p
       (lambda ()
 	(let ((group gnus-newsgroup-name))
@@ -341,7 +345,7 @@
       eshell-cmpl-cycle-completions nil)
 (setq dired-deletion-confirmer		;Make deletion easier in dired
       (symbol-function 'y-or-n-p)
-      delete-by-moving-to-trash t
+      delete-by-moving-to-trash (mdw-emacs-version-p 24)
       dired-listing-switches "-alF"	;Do `ls -F' things in dired windows
       wdired-allow-to-change-permissions 'advanced)
 (setq read-quoted-char-radix 16)	;C-q HEX-STUFF [RET]
@@ -371,7 +375,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 +582,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)
@@ -610,7 +615,7 @@
 
 ;; Other frame fiddling.
 
-(setq frame-title-format '("" invocation-name "@" system-name ": %b"))
+(setq frame-title-format '("Emacs " user-login-name "@" system-name " – %b"))
 
 ;; Global keymap changes.
 
@@ -621,19 +626,28 @@
       (require 'ido-completing-read+)
       (unless (fboundp 'ido-ubiquitous-mode) (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"
-						  "\\)"
-						  "\\'")))))
+      (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))