Merge remote-tracking branch 'refs/remotes/origin/master' Conflicts: emacs/init.el
Alan Pearce alan@alanpearce.co.uk
Mon, 07 Oct 2013 08:03:30 +0100
1 files changed, 6 insertions(+), 3 deletions(-)
jump to
M emacs/init.el → emacs/init.el
@@ -558,14 +558,18 @@ (ido-mode 1)) :config (progn (setq ido-decorations (quote ("\n›" "" "\n " "\n …" "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]" " [Confirm]")) ido-auto-merge-delay-time 99999 - ido-enable-flex-matching t - ido-use-virtual-buffers t) + ido-enable-flex-matching t) (ido-init-completion-maps) (defun ido-manual-merge () (interactive) (ido-initiate-auto-merge (current-buffer))) (bind-key "C-c C-s" #'ido-manual-merge ido-file-dir-completion-map))) + +(use-package flx-ido + :ensure t + :init (progn + (flx-ido-mode 1))) (use-package smex :ensure t @@ -1055,7 +1059,6 @@ ;;;; Programming (use-package auto-compile :ensure t - :commands (auto-compile-on-save-mode) :init (add-hook 'emacs-lisp-mode-hook #'auto-compile-on-save-mode)) (use-package cc-mode