diff --git a/core/core-ui.el b/core/core-ui.el index d72a884b7..b42c42a43 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -147,9 +147,11 @@ mode is detected.") ;; buffer name in frame title (setq-default frame-title-format '("DOOM Emacs")) + ;; standardize fringe width (push (cons 'left-fringe doom-ui-fringe-size) default-frame-alist) (push (cons 'right-fringe doom-ui-fringe-size) default-frame-alist) + ;; no fringe in the minibuffer (defun doom|no-fringes-in-minibuffer () (set-window-fringes (minibuffer-window) 0 0 nil)) diff --git a/modules/feature/eval/config.el b/modules/feature/eval/config.el index 3e02fffb2..0d4501f9e 100644 --- a/modules/feature/eval/config.el +++ b/modules/feature/eval/config.el @@ -94,7 +94,7 @@ function that creates and returns the REPL buffer." (add-hook 'quickrun--mode-hook #'nlinum-mode) :config (set! :popup - '("*quickrun*" :size 10 :noesc t :autokill t :autoclose t) + '("*quickrun*" :size 10 :noesc t :autokill t :autoclose t) '("*eval*" :size 12 :noselect t :autokill t :autoclose t) '("*Pp Eval Output*" :size 12 :noselect t :autokill t :autoclose t)) diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el index 7c7323833..ba40286ab 100644 --- a/modules/feature/evil/autoload/evil.el +++ b/modules/feature/evil/autoload/evil.el @@ -130,13 +130,13 @@ evil-window-move-* (e.g. `evil-window-move-far-left')" (select-window that-window)))) ;;;###autoload -(defun +evil/window-move-left () "`+evil--window-swap'" (interactive) (+evil--window-swap 'left)) +(defun +evil/window-move-left () "See `+evil--window-swap'" (interactive) (+evil--window-swap 'left)) ;;;###autoload -(defun +evil/window-move-right () "`+evil--window-swap'" (interactive) (+evil--window-swap 'right)) +(defun +evil/window-move-right () "See `+evil--window-swap'" (interactive) (+evil--window-swap 'right)) ;;;###autoload -(defun +evil/window-move-up () "`+evil--window-swap'" (interactive) (+evil--window-swap 'up)) +(defun +evil/window-move-up () "See `+evil--window-swap'" (interactive) (+evil--window-swap 'up)) ;;;###autoload -(defun +evil/window-move-down () "`+evil--window-swap'" (interactive) (+evil--window-swap 'down)) +(defun +evil/window-move-down () "See `+evil--window-swap'" (interactive) (+evil--window-swap 'down)) ;;;###autoload (autoload '+evil:macro-on-all-lines "feature/evil/autoload/evil" nil t) (evil-define-operator +evil:macro-on-all-lines (beg end &optional macro) diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index cfc8855f5..2752b2d43 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -63,6 +63,7 @@ :config (setq auto-compile-display-buffer nil auto-compile-use-mode-line nil) + (defun +emacs-lisp*load-after-compile (success) "Reload the current emacs-lisp file after it's recompiled, if an older version is loaded." diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index 6065a38eb..1c2b7e64f 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -21,7 +21,8 @@ ;; Favor local eslint over global, if available (defun +javascript|init-flycheck-elint () (when (derived-mode-p 'js-mode) - (when-let ((eslint (expand-file-name "node_modules/eslint/bin/eslint.js" (doom-project-root))) + (when-let ((eslint (expand-file-name "node_modules/eslint/bin/eslint.js" + (doom-project-root))) (exists-p (file-exists-p eslint)) (executable-p (file-executable-p eslint))) (setq-local flycheck-javascript-eslint-executable eslint)))) @@ -32,35 +33,35 @@ (map! :map js2-mode-map :localleader - :n "S" '+javascript/skewer-this-buffer + :n "S" #'+javascript/skewer-this-buffer :prefix "r" - :n "g" 'js2r-add-to-globals-annotation - :n "ca" 'js2r-arguments-to-object - :n "Xa" 'js2r-contract-array - :n "Xf" 'js2r-contract-function - :n "Xo" 'js2r-contract-object - :nv "d" 'js2r-debug-this - :n "xa" 'js2r-expand-array - :n "xf" 'js2r-expand-function - :n "xo" 'js2r-expand-object - :v "ef" 'js2r-extract-function - :v "em" 'js2r-extract-method - :v "ev" 'js2r-extract-var - :n "F" 'js2r-forward-barf - :n "f" 'js2r-forward-slurp - :v "ii" 'js2r-inject-global-in-iife - :v "iv" 'js2r-inline-var - :v "p" 'js2r-introduce-parameter - :n "p" 'js2r-localize-parameter - :nv "l" 'js2r-log-this - :n "r" 'js2r-rename-var - :n "ss" 'js2r-split-string - :n "sv" 'js2r-split-var-declaration - :n "ct" 'js2r-ternary-to-if - :v "u" 'js2r-unwrap - :n "t" 'js2r-var-to-this - :n "ii" 'js2r-wrap-buffer-in-iife)) + :n "g" #'js2r-add-to-globals-annotation + :n "ca" #'js2r-arguments-to-object + :n "Xa" #'js2r-contract-array + :n "Xf" #'js2r-contract-function + :n "Xo" #'js2r-contract-object + :nv "d" #'js2r-debug-this + :n "xa" #'js2r-expand-array + :n "xf" #'js2r-expand-function + :n "xo" #'js2r-expand-object + :v "ef" #'js2r-extract-function + :v "em" #'js2r-extract-method + :v "ev" #'js2r-extract-var + :n "F" #'js2r-forward-barf + :n "f" #'js2r-forward-slurp + :v "ii" #'js2r-inject-global-in-iife + :v "iv" #'js2r-inline-var + :v "p" #'js2r-introduce-parameter + :n "p" #'js2r-localize-parameter + :nv "l" #'js2r-log-this + :n "r" #'js2r-rename-var + :n "ss" #'js2r-split-string + :n "sv" #'js2r-split-var-declaration + :n "ct" #'js2r-ternary-to-if + :v "u" #'js2r-unwrap + :n "t" #'js2r-var-to-this + :n "ii" #'js2r-wrap-buffer-in-iife)) ;; A find-{definition,references} backend for js2-mode. NOTE The xref API is diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el index 4ecafe133..aa95db218 100644 --- a/modules/lang/latex/config.el +++ b/modules/lang/latex/config.el @@ -54,7 +54,7 @@ :config (map! :map reftex-mode-map - :leader :n ";" 'reftex-toc) + :localleader :n ";" 'reftex-toc) (add-hook! 'reftex-toc-mode-hook (reftex-toc-rescan) diff --git a/modules/lang/typescript/config.el b/modules/lang/typescript/config.el index 7b224cf22..9ee2f38db 100644 --- a/modules/lang/typescript/config.el +++ b/modules/lang/typescript/config.el @@ -17,15 +17,6 @@ ;; '(tide-documentation-at-point "current type documentation") ;; '(tide-restart-server "restart tide server")) - (defun +typescript|tide-setup () - (when (or (eq major-mode 'typescript-mode) - (and (eq major-mode 'web-mode) - buffer-file-name - (string= (file-name-extension buffer-file-name) "tsx"))) - (tide-setup) - (flycheck-mode +1) - (eldoc-mode +1))) - (add-hook! (typescript-mode web-mode) #'+typescript|tide-setup) (map! :localleader :m "fh" #'tide-documentation-at-point)) @@ -43,5 +34,15 @@ '(:insertSpaceAfterFunctionKeywordForAnonymousFunctions t :placeOpenBraceOnNewLineForFunctions nil)) + (defun +typescript|init-tide () + (when (or (eq major-mode 'typescript-mode) + (and (eq major-mode 'web-mode) + buffer-file-name + (equal (file-name-extension buffer-file-name) "tsx"))) + (tide-setup) + (flycheck-mode +1) + (eldoc-mode +1))) + (add-hook! (typescript-mode web-mode) #'+typescript|init-tide) + (advice-add #'tide-project-root :override #'doom*project-root)) diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el index 91498cb9d..630a989c1 100644 --- a/modules/lang/web/+css.el +++ b/modules/lang/web/+css.el @@ -23,7 +23,7 @@ :init (add-hook 'css-mode-hook #'counsel-css-imenu-setup) (map! :map* (css-mode-map scss-mode-map less-css-mode-map) - :leader :n ";" #'counsel-css)) + :localleader :n ";" #'counsel-css)) (def-package! rainbow-mode diff --git a/modules/tools/electric-indent/config.el b/modules/tools/electric-indent/config.el index 9eb04db3f..1a7bf5ade 100644 --- a/modules/tools/electric-indent/config.el +++ b/modules/tools/electric-indent/config.el @@ -8,7 +8,7 @@ (defvar-local doom-electric-indent-words '() "TODO") -(setq electric-indent-chars '(?\n ?\^?)) +(setq-default electric-indent-chars '(?\n ?\^?)) (defun +electric-indent|char (_c) (when (and (eolp) doom-electric-indent-words) diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el index d2a71fdc7..5c50226b2 100644 --- a/modules/ui/doom-modeline/config.el +++ b/modules/ui/doom-modeline/config.el @@ -17,7 +17,7 @@ (setq eldoc-in-minibuffer-show-fn #'+doom-modeline--show-eldoc) (eldoc-in-minibuffer-mode +1)) -;; anzu and evil-anzu make it possible to display current/total in the +;; anzu and evil-anzu expose current/total state that can be displayed in the ;; mode-line. (def-package! evil-anzu :when (featurep 'evil)