diff options
| author | Alan Pearce | 2013-10-07 08:03:30 +0100 |
|---|---|---|
| committer | Alan Pearce | 2013-10-07 08:03:30 +0100 |
| commit | d78b4c91e6985006094ad090f69bbc7b7eaa5da8 (patch) | |
| tree | 95d3d4a3842e77e7a997c6ae5a08d2973cee8cec | |
| parent | caa651f5da454e83d35df086bd40883d6acaab54 (diff) | |
| parent | 679f2843746576f48e4ffd106a21753346fc4bcb (diff) | |
| download | nixfiles-d78b4c91e6985006094ad090f69bbc7b7eaa5da8.tar.lz nixfiles-d78b4c91e6985006094ad090f69bbc7b7eaa5da8.tar.zst nixfiles-d78b4c91e6985006094ad090f69bbc7b7eaa5da8.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts: emacs/init.el
| -rw-r--r-- | emacs/init.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/emacs/init.el b/emacs/init.el index a8526340..0b92b4e8 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -558,8 +558,7 @@ Values: `desktop', `server', `laptop'") :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 () @@ -567,6 +566,11 @@ Values: `desktop', `server', `laptop'") (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 :bind (("M-x" . smex) @@ -1055,7 +1059,6 @@ Also returns nil if pid is nil." (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 |