Only bind C-s in minibuffer if ivy/helm are available

This commit is contained in:
Henrik Lissner 2020-03-28 20:08:53 -04:00
parent cf180bea92
commit 064603f6e6
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 5 additions and 5 deletions

View file

@ -6,10 +6,7 @@
;; Minibuffer ;; Minibuffer
(define-key! evil-ex-completion-map (define-key! evil-ex-completion-map
"C-a" #'evil-beginning-of-line "C-a" #'evil-beginning-of-line
"C-b" #'evil-backward-char "C-b" #'evil-backward-char)
"C-s" (if (featurep! :completion ivy)
#'counsel-minibuffer-history
#'helm-minibuffer-history))
(define-key! :keymaps +default-minibuffer-maps (define-key! :keymaps +default-minibuffer-maps
[escape] #'abort-recursive-edit [escape] #'abort-recursive-edit

View file

@ -382,7 +382,10 @@
#'counsel-minibuffer-history) #'counsel-minibuffer-history)
((featurep! :completion helm) ((featurep! :completion helm)
#'helm-minibuffer-history))) #'helm-minibuffer-history)))
(define-key! :keymaps +default-minibuffer-maps (define-key!
:keymaps (append +default-minibuffer-maps
(when (featurep! :editor evil +everywhere)
'(evil-ex-completion-map)))
"C-s" command)) "C-s" command))
;; Smarter C-a/C-e for both Emacs and Evil. C-a will jump to indentation. ;; Smarter C-a/C-e for both Emacs and Evil. C-a will jump to indentation.