From f12cd31a0fa11a147177901eb3b34af4f10191e6 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <technomancy@gmail.com>
Date: Tue, 11 Oct 2011 19:40:39 -0700
Subject: [PATCH] Bump ido-ubiquitous to 0.4.

---
 starter-kit-misc.el | 13 +------------
 starter-kit-pkg.el  |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/starter-kit-misc.el b/starter-kit-misc.el
index f08c60f42c..d96bb958a9 100644
--- a/starter-kit-misc.el
+++ b/starter-kit-misc.el
@@ -79,6 +79,7 @@
 
 ;; ido-mode is like magic pixie dust!
 (ido-mode t)
+(ido-ubiquitous t)
 (setq ido-enable-prefix nil
       ido-enable-flex-matching t
       ido-auto-merge-work-directories-length nil
@@ -88,18 +89,6 @@
       ido-handle-duplicate-virtual-buffers 2
       ido-max-prospects 10)
 
-;; Keep spreading that magic ido pixie dust!
-(eval-after-load 'ido-ubiquitous
-  '(cond 
-    ;; New version
-    ((fboundp 'ido-ubiquitous)
-     (ido-ubiquitous 1))
-    ;; Old version
-    ((boundp 'ido-ubiquitous-enabled)
-     ;; Probably not required, since the old version of ido-ubiquitous
-     ;; is enabled by default.
-     (setq ido-ubiquitous-enabled t)))
-
 (set-default 'indent-tabs-mode nil)
 (set-default 'indicate-empty-lines t)
 (set-default 'imenu-auto-rescan t)
diff --git a/starter-kit-pkg.el b/starter-kit-pkg.el
index 77e25f0c22..af6a8bf22c 100644
--- a/starter-kit-pkg.el
+++ b/starter-kit-pkg.el
@@ -1,4 +1,4 @@
 (define-package "starter-kit" "2.0.2"
   "Saner defaults and goodies."
   '((paredit "22") (idle-highlight-mode "1.1.1") (find-file-in-project "3.0")
-    (smex "1.1.1") (ido-ubiquitous "0.1") (magit "0.8.1")))
+    (smex "1.1.1") (ido-ubiquitous "0.4") (magit "0.8.1")))