dot/emacs: Only load `ido-ubiquitous' if we really need it.

It's folded into `ido-completing-read+' in later versions, and you get
an annoying warning if you ask for it anyway.

diff --git a/dot/emacs b/dot/emacs
index a7ac91d..978cf3a 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -618,7 +618,9 @@
   (windmove-default-keybindings))
 (setq windmove-wrap-around t)
 (trap (require 'ido) (ido-mode 1)
-      (require 'ido-ubiquitous) (ido-ubiquitous-mode 1)
+      (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