about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--init.el2
-rw-r--r--init/custom.el6
-rw-r--r--init/settings.el6
3 files changed, 8 insertions, 6 deletions
diff --git a/init.el b/init.el
index db788c4d224e..0761b13a309f 100644
--- a/init.el
+++ b/init.el
@@ -29,7 +29,7 @@
     haskell-mode
     hi2
     idle-highlight-mode
-    ido-ubiquitous
+    ido-completing-read+
     iy-go-to-char
     magit
     markdown-mode+
diff --git a/init/custom.el b/init/custom.el
index 03183f7d5a70..d3ef8efbd6db 100644
--- a/init/custom.el
+++ b/init/custom.el
@@ -7,20 +7,18 @@
  '(ac-delay 0.2)
  '(custom-safe-themes
    (quote
-    ("c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "26614652a4b3515b4bbbb9828d71e206cc249b67c9142c06239ed3418eff95e2" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "72e42ba8f32bbf4a0b30c4c25f378289058efb1790dbd9a3e7c3d9666cc7fee4" "0e7da2c7c64fb5d4764250ffa4b8b33c0946577108d1d6444f1020d0dabba784" "6a37be365d1d95fad2f4d185e51928c789ef7a4ccf17e7ca13ad63a8bf5b922f" "6e92ca53a22d9b0577ad0b16e07e2e020c8b621197e39fec454048e51b7954cb" default)))
+    ("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" default)))
  '(frame-brackground-mode (quote dark))
  '(global-auto-complete-mode t)
  '(ido-use-filename-at-point nil)
  '(magit-log-show-gpg-status t)
- '(nil nil t)
  '(ns-alternate-modifier (quote none))
  '(ns-command-modifier (quote control))
  '(ns-right-command-modifier (quote meta))
  '(package-selected-packages
    (quote
     (fish-mode string-inflection groovy-mode swift-mode toml-mode nginx-mode elixir-mode terraform-mode uuidgen uuid yaml-mode undo-tree switch-window smex smart-mode-line rust-mode rainbow-mode rainbow-delimiters puppet-mode projectile pkgbuild-mode password-store paredit multi-term multiple-cursors markdown-mode+ magit iy-go-to-char ido-ubiquitous idle-highlight-mode hi2 haskell-mode go-mode flycheck flx-ido erlang dockerfile-mode confluence cider browse-kill-ring ag ace-jump-mode)))
- '(require-final-newline (quote visit-save))
- '(sml/theme (quote dark)))
+ '(require-final-newline (quote visit-save)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/init/settings.el b/init/settings.el
index 4aa5da15dc10..bc78d62be2d7 100644
--- a/init/settings.el
+++ b/init/settings.el
@@ -84,7 +84,11 @@
 
 ;; ido-mode is like magic pixie dust!
 (ido-mode t)
-(ido-ubiquitous t)
+
+;; ido-completing-read+ enables ido everywhere, not just for buffers and files.
+(require 'ido-completing-read+)
+(ido-ubiquitous-mode 1)
+
 (setq ido-enable-prefix nil
       ido-enable-flex-matching t
       ido-auto-merge-work-directories-length nil