diff --git a/core/cli/env.el b/core/cli/env.el index 866d82c48..b32efefef 100644 --- a/core/cli/env.el +++ b/core/cli/env.el @@ -3,9 +3,9 @@ (defcli! env ((clear-p ["-c" "--clear"] "Clear and delete your envvar file") (outputfile ["-o" PATH] - "Generate the envvar file at PATH. Note that envvar files that aren't in -`doom-env-file' won't be loaded automatically at startup. You will need to -load them manually from your private config with the `doom-load-envvars-file' + "Generate the envvar file at PATH. Envvar files that aren't in +`doom-env-file' won't be loaded automatically at startup. You will need to load +them manually from your private config with the `doom-load-envvars-file' function.")) "Creates or regenerates your envvars file. diff --git a/core/cli/install.el b/core/cli/install.el index 357487115..ff4e7e6fe 100644 --- a/core/cli/install.el +++ b/core/cli/install.el @@ -68,7 +68,7 @@ DOOMDIR environment variable. e.g. (if (file-exists-p doom-env-file) (print! (info "Envvar file already exists, skipping")) (when (or doom-auto-accept - (y-or-n-p "Generate an env file? (see `doom help env` for details)")) + (y-or-n-p "Generate an envvar file? (see `doom help env` for details)")) (doom-cli-reload-env-file 'force-p)))) ;; Install Doom packages diff --git a/core/core-editor.el b/core/core-editor.el index bae568c30..49d1b6bc2 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -557,7 +557,7 @@ files, so we replace calls to `pp' with the much faster `prin1'." :config (appendq! ws-butler-global-exempt-modes '(special-mode comint-mode term-mode eshell-mode)) - (ws-butler-global-mode)) + (ws-butler-global-mode +1)) (provide 'core-editor) ;;; core-editor.el ends here diff --git a/core/core-ui.el b/core/core-ui.el index 2918a1f88..b2f557893 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -272,7 +272,8 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original (setq frame-title-format '("%b – Doom Emacs") icon-title-format frame-title-format) -;; Don't resize emacs in steps, it looks weird. +;; Don't resize windows & frames in steps; it's prohibitive to prevent the user +;; from resizing it to exact dimensions, and looks weird. (setq window-resize-pixelwise t frame-resize-pixelwise t) @@ -283,18 +284,16 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original (push '(tool-bar-lines . 0) default-frame-alist) (push '(vertical-scroll-bars) default-frame-alist)) -;; Sets `ns-appearance' and `ns-transparent-titlebar' on GUI frames (and fixes -;; mismatching text color in the frame title) (when IS-MAC ;; Curse Lion and its sudden but inevitable fullscreen mode! ;; NOTE Meaningless to railwaycat's emacs-mac build - (setq ns-use-native-fullscreen nil - ;; Visit files opened outside of Emacs in existing frame, rather than a - ;; new one - ns-pop-up-frames nil) + (setq ns-use-native-fullscreen nil) - ;; Sets ns-transparent-titlebar and ns-appearance frame parameters as is - ;; appropriate for the loaded theme. + ;; Visit files opened outside of Emacs in existing frame, not a new one + (setq ns-pop-up-frames nil) + + ;; Sets `ns-transparent-titlebar' and `ns-appearance' frame parameters so + ;; window borders will match the enabled theme. (and (or (daemonp) (display-graphic-p)) (require 'ns-auto-titlebar nil t) @@ -323,14 +322,15 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original ;; always avoid GUI (setq use-dialog-box nil) -;; Don't display floating tooltips; display their contents in the echo-area. +;; Don't display floating tooltips; display their contents in the echo-area, +;; because native tooltips are ugly. (when (bound-and-true-p tooltip-mode) (tooltip-mode -1)) -;; native linux tooltips are ugly +;; ...especially on linux (when IS-LINUX (setq x-gtk-use-system-tooltips nil)) - ;; Favor vertical splits over horizontal ones + ;; Favor vertical splits over horizontal ones. Screens are usually wide. (setq split-width-threshold 160 split-height-threshold nil) @@ -339,7 +339,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original ;;; Minibuffer ;; Allow for minibuffer-ception. Sometimes we need another minibuffer command -;; _while_ we're in the minibuffer. +;; while we're in the minibuffer. (setq enable-recursive-minibuffers t) ;; Show current key-sequence in minibuffer, like vim does. Any feedback after diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el index 16da1b377..0de2abd17 100644 --- a/modules/editor/evil/config.el +++ b/modules/editor/evil/config.el @@ -21,7 +21,7 @@ directives. By default, this only recognizes C directives.") ;; Set these defaults before `evil'; use `defvar' so they can be changed prior ;; to loading. (defvar evil-want-C-i-jump (or (daemonp) (display-graphic-p))) -(defvar evil-want-C-u-scroll t) +(defvar evil-want-C-u-scroll t) ; moved the universal arg to u (defvar evil-want-C-u-delete t) (defvar evil-want-C-w-scroll t) (defvar evil-want-C-w-delete t) diff --git a/modules/editor/evil/test/test-evil.el b/modules/editor/evil/test/test-evil.el index 99694f11e..dd77fd0f4 100644 --- a/modules/editor/evil/test/test-evil.el +++ b/modules/editor/evil/test/test-evil.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/evil/test/test-evil.el -(describe "feature/evil" +(describe "editor/evil" :var (resv project-root) (require! :editor evil) diff --git a/modules/tools/lookup/autoload/lookup.el b/modules/tools/lookup/autoload/lookup.el index a2ba7a534..fa4f51bf4 100644 --- a/modules/tools/lookup/autoload/lookup.el +++ b/modules/tools/lookup/autoload/lookup.el @@ -130,20 +130,22 @@ This can be passed nil as its second argument to unset handlers for MODES. e.g. (defun +lookup--jump-to (prop identifier &optional display-fn arg) (let* ((origin (point-marker)) - (handlers (plist-get (list :definition '+lookup-definition-functions - :references '+lookup-references-functions - :documentation '+lookup-documentation-functions - :file '+lookup-file-functions) - prop)) + (handlers + (plist-get (list :definition '+lookup-definition-functions + :references '+lookup-references-functions + :documentation '+lookup-documentation-functions + :file '+lookup-file-functions) + prop)) (result (if arg - (if-let* - ((handler (intern-soft - (completing-read "Select lookup handler: " - (delete-dups - (remq t (append (symbol-value handlers) - (default-value handlers)))) - nil t)))) + (if-let + (handler + (intern-soft + (completing-read "Select lookup handler: " + (delete-dups + (remq t (append (symbol-value handlers) + (default-value handlers)))) + nil t))) (+lookup--run-handlers handler identifier origin) (user-error "No lookup handler selected")) (run-hook-wrapped handlers #'+lookup--run-handlers identifier origin))))