diff --git a/core/core-editor.el b/core/core-editor.el index de5905097..db5f9df64 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -208,6 +208,7 @@ fundamental-mode) for performance sake." (setq undo-tree-auto-save-history t undo-tree-history-directory-alist (list (cons "." (concat doom-cache-dir "undo-tree-hist/")))) + (defun doom*silence-undo-tree-load (orig-fn &rest args) "Silence undo-tree load errors." (quiet! (apply orig-fn args))) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index b20dc6940..3294fbce2 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -241,7 +241,7 @@ across windows." (add-hook 'doom-post-init-hook #'evil-escape-mode) :config ;; no `evil-escape' in minibuffer - (cl-pushnew #'minibufferp evil-escape-inhibit-functions) + (cl-pushnew #'minibufferp evil-escape-inhibit-functions :test #'eq) (map! :irvo "C-g" #'evil-escape)) @@ -259,7 +259,7 @@ across windows." :commands (evilmi-jump-items evilmi-text-object global-evil-matchit-mode) :config (global-evil-matchit-mode 1) :init - (map! [remap evil-jump-item] #'evilmi-jump-items + (map! [remap evil-jump-item] #'evilmi-jump-items :textobj "%" #'evilmi-text-object #'evilmi-text-object) :config (defun +evil|simple-matchit () @@ -304,7 +304,8 @@ the new algorithm is confusing, like in python or ruby." (dolist (fn '(doom/deflate-space-maybe doom/inflate-space-maybe doom/backward-to-bol-or-indent doom/forward-to-last-non-comment-or-eol doom/backward-kill-to-bol-and-indent doom/newline-and-indent)) - (push (cons fn '((:default . evil-mc-execute-default-call))) evil-mc-custom-known-commands)) + (push (cons fn '((:default . evil-mc-execute-default-call))) + evil-mc-custom-known-commands)) (defun +evil|escape-multiple-cursors () "Clear evil-mc cursors and restore state." @@ -318,7 +319,8 @@ the new algorithm is confusing, like in python or ruby." (push 'evil-escape-mode evil-mc-incompatible-minor-modes)) -(def-package! evil-snipe :demand t +(def-package! evil-snipe + :demand t :init (setq evil-snipe-smart-case t evil-snipe-scope 'line diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index 1c2b7e64f..b2bd9ee15 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -11,7 +11,7 @@ (add-hook! 'js2-mode-hook #'(flycheck-mode highlight-indentation-mode rainbow-delimiters-mode)) - (set! :repl 'js2-mode '+javascript/repl) + (set! :repl 'js2-mode #'+javascript/repl) (set! :electric 'js2-mode :chars '(?\} ?\) ?.)) (set! :jump 'js2-mode :xref-backend #'xref-js2-xref-backend)