diff --git a/modules/config/default/config.el b/modules/config/default/config.el index 4d92bf507..8184454b4 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -141,7 +141,7 @@ ;; OS specific fixes (when IS-MAC ;; Fix MacOS shift+tab - (define-key input-decode-map [S-iso-lefttab] [backtab]) + (define-key key-translation-map [S-iso-lefttab] [backtab]) ;; Fix conventional OS keys in Emacs (map! "s-`" #'other-frame ; fix frame-switching ;; fix OS window/frame navigation/manipulation keys diff --git a/modules/lang/clojure/autoload.el b/modules/lang/clojure/autoload.el index 79cb6ea70..979e57b93 100644 --- a/modules/lang/clojure/autoload.el +++ b/modules/lang/clojure/autoload.el @@ -1,5 +1,17 @@ ;;; lang/clojure/autoload.el -*- lexical-binding: t; -*- +;;;###autoload +(defun +clojure-cider-lookup-definition (identifier) + "A lookup handler for `cider-mode'. + +This is necessary to fix `cider-find-dwim's inability to capture the full symbol +at point." + (cider-find-dwim identifier)) + + +;; +;;; Commands + ;;;###autoload (defun +clojure/repl (&optional arg) "Open a Cider REPL and return the buffer." @@ -12,9 +24,3 @@ "TODO" (interactive) (cider-switch-to-repl-buffer t)) - -;;;###autoload -(defun +clojure-lookup-symbol (identifier) - "A lookup handler for `cider-find-dwim'. -This is necessary to fix its inability to capture the full symbol at point." - (cider-find-dwim identifier)) diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el index 866af23e2..d65903646 100644 --- a/modules/lang/clojure/config.el +++ b/modules/lang/clojure/config.el @@ -13,7 +13,7 @@ (set-repl-handler! 'clojure-mode #'+clojure/repl) (set-eval-handler! 'clojure-mode #'cider-eval-region) (set-lookup-handlers! 'cider-mode - :definition #'+clojure-lookup-symbol + :definition #'+clojure-cider-lookup-definition :documentation #'cider-doc) (add-hook 'cider-mode-hook #'eldoc-mode) :config diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index 0b198ead0..2f2d6d289 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -30,7 +30,6 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.") :symbols '(("t" "nil") ("let" "let*") ("when" "unless") - ("append" "prepend") ("advice-add" "advice-remove") ("add-hook" "remove-hook") ("add-hook!" "remove-hook!"))) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index 0ff61fdfd..6d13982ba 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -159,9 +159,9 @@ (setq-default company-backends (delq 'company-tide (default-value 'company-backends)))) (set-company-backend! 'tide-mode 'company-tide) ;; navigation - (set-lookup-handlers! 'tide-mode :async t - :definition #'tide-jump-to-definition - :references #'tide-references) + (set-lookup-handlers! 'tide-mode + :definition '(tide-jump-to-definition :async t) + :references '(tide-references :async t)) ;; resolve to `doom-project-root' if `tide-project-root' fails (advice-add #'tide-project-root :override #'+javascript*tide-project-root) ;; cleanup tsserver when no tide buffers are left diff --git a/modules/lang/web/+html.el b/modules/lang/web/+html.el index 7b6bb02bb..e1fee0ea0 100644 --- a/modules/lang/web/+html.el +++ b/modules/lang/web/+html.el @@ -57,7 +57,7 @@ (if (string-match "\\(?:>\\|]\\|}\\)+\\'" string) (replace-match "" t t string) string)))))) - (delq (assq nil web-mode-engines-auto-pairs) web-mode-engines-auto-pairs)) + (delq! nil web-mode-engines-auto-pairs)) (map! :map web-mode-map (:localleader