From 33a8812f3c7670852d9f8f91e315d91b195da24b Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Fri, 20 Mar 2020 16:27:56 +0000 Subject: [PATCH] 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. --- dot/emacs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dot/emacs b/dot/emacs index a7ac91d..978cf3a 100644 --- 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 -- 2.11.0