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

diff --git a/dot/emacs b/dot/emacs
index 978cf3a..9dd28f2 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)
@@ -621,19 +623,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))