ivy: remap apropos; load ivy-mode sooner; refactor

This commit is contained in:
Henrik Lissner 2017-06-09 13:38:54 +02:00
parent 33b2ed0545
commit f65ae53e2e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 4 additions and 3 deletions

View file

@ -26,8 +26,8 @@
(project-root (doom-project-root)) (project-root (doom-project-root))
(query (query
(or query (or query
(and (evil-visual-state-p) (and beg end
beg end (> (abs (- end beg)) 1)
(rxt-quote-pcre (buffer-substring-no-properties beg end))) (rxt-quote-pcre (buffer-substring-no-properties beg end)))
+ivy--file-last-search)) +ivy--file-last-search))
(prompt (prompt

View file

@ -40,9 +40,10 @@ session)."
(after! magit (setq magit-completing-read-function #'ivy-completing-read)) (after! magit (setq magit-completing-read-function #'ivy-completing-read))
(after! yasnippet (push #'+ivy-yas-prompt yas-prompt-functions)) (after! yasnippet (push #'+ivy-yas-prompt yas-prompt-functions))
(add-hook 'window-setup-hook #'ivy-mode) (add-hook 'emacs-startup-hook #'ivy-mode)
(map! :map ivy-mode-map (map! :map ivy-mode-map
[remap apropos] #'counsel-apropos
[remap describe-face] #'counsel-describe-face [remap describe-face] #'counsel-describe-face
[remap find-file] #'counsel-find-file [remap find-file] #'counsel-find-file
[remap switch-to-buffer] #'+ivy/switch-buffer [remap switch-to-buffer] #'+ivy/switch-buffer