djm
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some consult preview-related bindings (plus tidy comments)

This commit is contained in:
David Morgan 2021-09-07 19:23:56 +01:00
parent fb211f401b
commit e1835dfcc3
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.emacs.d/lisp/init-minibuffer.el
View File

@ -141,7 +141,13 @@
:map isearch-mode-map :map isearch-mode-map
("M-e" . consult-isearch) ;; orig. isearch-edit-string ("M-e" . consult-isearch) ;; orig. isearch-edit-string
("M-s e" . consult-isearch) ;; orig. isearch-edit-string ("M-s e" . consult-isearch) ;; orig. isearch-edit-string
("M-s l" . consult-line)) ;; needed by consult-line to detect isearch ("M-s l" . consult-line) ;; needed by consult-line to detect isearch
(:map vertico-map
;; These are used for previewing with some consult commands (see consult-customize call below)
("C-S-p" . vertico-previous)
("C-S-n" . vertico-next)
;; Toggle preview on/off without changing preview-key
("M-P" . consult-toggle-preview)))
:init :init
@ -228,29 +234,26 @@
(define-key search-map "u" 'consult-focus-lines) (define-key search-map "u" 'consult-focus-lines)
(define-key search-map "e" 'consult-isearch) (define-key search-map "e" 'consult-isearch)
;; Optionally configure preview. The default value
;; is 'any, such that any key triggers the preview.
;; (setq consult-preview-key 'any)
;; (setq consult-preview-key (kbd "M-."))
;; (setq consult-preview-key (list (kbd "<S-down>") (kbd "<S-up>")))
;; For some commands and buffer sources it is useful to configure the
;; :preview-key on a per-command basis using the `consult-customize' macro.
(consult-customize (consult-customize
consult-theme consult-theme
:preview-key '(:debounce 0.2 any) :preview-key '(:debounce 0.2 any)
;; For these commands we can use C-S/C-P to scoll and preview, or M-. to preview
consult-ripgrep consult-git-grep consult-grep consult-ripgrep consult-git-grep consult-grep
consult-ripgrep-unrestricted consult-ripgrep-symbol-at-point consult-ripgrep-unrestricted consult-ripgrep-symbol-at-point
consult-bookmark consult-recent-file consult-xref consult-buffer-no-preview consult-bookmark consult-recent-file consult-xref consult-buffer-no-preview
consult--source-file consult--source-project-file consult--source-bookmark consult--source-file consult--source-project-file consult--source-bookmark
:preview-key (kbd "M-.")) :preview-key (list (kbd "M-.") (kbd "C-S-n") (kbd "C-S-p")))
;; Optionally configure the narrowing key. (defun consult-toggle-preview ()
;; Both < and C-+ work reasonably well. "Command to enable/disable preview."
(setq consult-narrow-key "<") ;; (kbd "C-+") (interactive)
(if consult-toggle-preview-orig
(setq consult--preview-function consult-toggle-preview-orig
consult-toggle-preview-orig nil)
(setq consult-toggle-preview-orig consult--preview-function
consult--preview-function #'ignore)))
;; Optionally make narrowing help available in the minibuffer. (setq consult-narrow-key "<")
;; You may want to use `embark-prefix-help-command' or which-key instead.
;; (define-key consult-narrow-map (vconcat consult-narrow-key "?") #'consult-narrow-help)
(setq consult-project-root-function (setq consult-project-root-function
(lambda () (lambda ()
@ -365,7 +368,6 @@
:init :init
(setq prefix-help-command #'embark-prefix-help-command) (setq prefix-help-command #'embark-prefix-help-command)
:config :config
;; (define-key minibuffer-local-map (kbd "M-.") #'embark-preview)
(defun embark-preview () (defun embark-preview ()
(interactive) (interactive)
(unless (bound-and-true-p consult--preview-function) ;; Disable preview for Consult commands (unless (bound-and-true-p consult--preview-function) ;; Disable preview for Consult commands