dev: merge branch 'master' of github.com:doomemacs

This commit is contained in:
Matt Nish-Lapidus 2024-08-22 10:01:32 -04:00
commit 6aea3c184d
3 changed files with 20 additions and 14 deletions

View file

@ -134,11 +134,12 @@ capture, the end position, and the output buffer.")
(map! :map evil-markdown-mode-map (map! :map evil-markdown-mode-map
:n "TAB" #'markdown-cycle :n "TAB" #'markdown-cycle
:n [backtab] #'markdown-shifttab :n [backtab] #'markdown-shifttab
:i "M-*" #'markdown-insert-list-item (:unless evil-disable-insert-state-bindings
:i "M-b" #'markdown-insert-bold :i "M-*" #'markdown-insert-list-item
:i "M-i" #'markdown-insert-italic :i "M-b" #'markdown-insert-bold
:i "M-`" #'+markdown/insert-del :i "M-i" #'markdown-insert-italic
:i "M--" #'markdown-insert-hr :i "M-`" #'+markdown/insert-del
:i "M--" #'markdown-insert-hr)
:n "M-r" #'browse-url-of-file :n "M-r" #'browse-url-of-file
:m "]h" #'markdown-next-visible-heading :m "]h" #'markdown-next-visible-heading
:m "[h" #'markdown-previous-visible-heading :m "[h" #'markdown-previous-visible-heading

View file

@ -226,13 +226,17 @@ Emacs versions < 29."
(use-package! eshell-did-you-mean (use-package! eshell-did-you-mean
:after esh-mode ; Specifically esh-mode, not eshell :after esh-mode ; Specifically esh-mode, not eshell
:config :config (eshell-did-you-mean-setup)
(eshell-did-you-mean-setup)
;; HACK There is a known issue with `eshell-did-you-mean' where it does not ;; HACK: `pcomplete-completions' returns a function, but
;; work on first invocation, so we invoke it once manually by setting the ;; `eshell-did-you-mean--get-all-commands' unconditionally expects it to
;; last command and then calling the output filter. ;; return a list of strings, causing wrong-type-arg errors in many cases.
(setq eshell-last-command-name "catt") ;; `all-completions' handles all these cases.
(eshell-did-you-mean-output-filter "catt: command not found")) (defadvice! +eshell--fix-eshell-did-you-mean-a (&rest _)
:override #'eshell-did-you-mean--get-all-commands
(unless eshell-did-you-mean--all-commands
(setq eshell-did-you-mean--all-commands
(all-completions "" (pcomplete-completions))))))
(use-package eshell-syntax-highlighting (use-package eshell-syntax-highlighting

View file

@ -190,6 +190,7 @@ Respects `diff-hl-disable-on-remote'."
;; HACK: This advice won't work in *all* cases (it's a C function, and any ;; HACK: This advice won't work in *all* cases (it's a C function, and any
;; calls to it from C won't trigger advice), but the thread issues above are ;; calls to it from C won't trigger advice), but the thread issues above are
;; triggered from Elisp's buffer API (from what I can tell). ;; triggered from Elisp's buffer API (from what I can tell).
(defadvice! +vc-gutter--kill-diff-hl-thread-a (buf) (defadvice! +vc-gutter--kill-diff-hl-thread-a (&optional buf)
:before #'kill-buffer :before #'kill-buffer
(with-current-buffer buf (+vc-gutter--kill-thread t)))) (with-current-buffer (or buf (current-buffer))
(+vc-gutter--kill-thread t))))