General comment revision & reformatting

This commit is contained in:
Henrik Lissner 2019-12-21 14:58:40 -05:00
parent 3583e1f2e0
commit b53703d527
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
7 changed files with 34 additions and 32 deletions

View file

@ -3,9 +3,9 @@
(defcli! env (defcli! env
((clear-p ["-c" "--clear"] "Clear and delete your envvar file") ((clear-p ["-c" "--clear"] "Clear and delete your envvar file")
(outputfile ["-o" PATH] (outputfile ["-o" PATH]
"Generate the envvar file at PATH. Note that envvar files that aren't in "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 `doom-env-file' won't be loaded automatically at startup. You will need to load
load them manually from your private config with the `doom-load-envvars-file' them manually from your private config with the `doom-load-envvars-file'
function.")) function."))
"Creates or regenerates your envvars file. "Creates or regenerates your envvars file.

View file

@ -68,7 +68,7 @@ DOOMDIR environment variable. e.g.
(if (file-exists-p doom-env-file) (if (file-exists-p doom-env-file)
(print! (info "Envvar file already exists, skipping")) (print! (info "Envvar file already exists, skipping"))
(when (or doom-auto-accept (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)))) (doom-cli-reload-env-file 'force-p))))
;; Install Doom packages ;; Install Doom packages

View file

@ -557,7 +557,7 @@ files, so we replace calls to `pp' with the much faster `prin1'."
:config :config
(appendq! ws-butler-global-exempt-modes (appendq! ws-butler-global-exempt-modes
'(special-mode comint-mode term-mode eshell-mode)) '(special-mode comint-mode term-mode eshell-mode))
(ws-butler-global-mode)) (ws-butler-global-mode +1))
(provide 'core-editor) (provide 'core-editor)
;;; core-editor.el ends here ;;; core-editor.el ends here

View file

@ -272,7 +272,8 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
(setq frame-title-format '("%b Doom Emacs") (setq frame-title-format '("%b Doom Emacs")
icon-title-format frame-title-format) 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 (setq window-resize-pixelwise t
frame-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 '(tool-bar-lines . 0) default-frame-alist)
(push '(vertical-scroll-bars) 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 (when IS-MAC
;; Curse Lion and its sudden but inevitable fullscreen mode! ;; Curse Lion and its sudden but inevitable fullscreen mode!
;; NOTE Meaningless to railwaycat's emacs-mac build ;; NOTE Meaningless to railwaycat's emacs-mac build
(setq ns-use-native-fullscreen nil (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)
;; Sets ns-transparent-titlebar and ns-appearance frame parameters as is ;; Visit files opened outside of Emacs in existing frame, not a new one
;; appropriate for the loaded theme. (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) (and (or (daemonp)
(display-graphic-p)) (display-graphic-p))
(require 'ns-auto-titlebar nil t) (require 'ns-auto-titlebar nil t)
@ -323,14 +322,15 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
;; always avoid GUI ;; always avoid GUI
(setq use-dialog-box nil) (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) (when (bound-and-true-p tooltip-mode)
(tooltip-mode -1)) (tooltip-mode -1))
;; native linux tooltips are ugly ;; ...especially on linux
(when IS-LINUX (when IS-LINUX
(setq x-gtk-use-system-tooltips nil)) (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 (setq split-width-threshold 160
split-height-threshold nil) split-height-threshold nil)
@ -339,7 +339,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
;;; Minibuffer ;;; Minibuffer
;; Allow for minibuffer-ception. Sometimes we need another minibuffer command ;; 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) (setq enable-recursive-minibuffers t)
;; Show current key-sequence in minibuffer, like vim does. Any feedback after ;; Show current key-sequence in minibuffer, like vim does. Any feedback after

View file

@ -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 ;; Set these defaults before `evil'; use `defvar' so they can be changed prior
;; to loading. ;; to loading.
(defvar evil-want-C-i-jump (or (daemonp) (display-graphic-p))) (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 <leader> u
(defvar evil-want-C-u-delete t) (defvar evil-want-C-u-delete t)
(defvar evil-want-C-w-scroll t) (defvar evil-want-C-w-scroll t)
(defvar evil-want-C-w-delete t) (defvar evil-want-C-w-delete t)

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; editor/evil/test/test-evil.el ;;; editor/evil/test/test-evil.el
(describe "feature/evil" (describe "editor/evil"
:var (resv project-root) :var (resv project-root)
(require! :editor evil) (require! :editor evil)

View file

@ -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) (defun +lookup--jump-to (prop identifier &optional display-fn arg)
(let* ((origin (point-marker)) (let* ((origin (point-marker))
(handlers (plist-get (list :definition '+lookup-definition-functions (handlers
:references '+lookup-references-functions (plist-get (list :definition '+lookup-definition-functions
:documentation '+lookup-documentation-functions :references '+lookup-references-functions
:file '+lookup-file-functions) :documentation '+lookup-documentation-functions
prop)) :file '+lookup-file-functions)
prop))
(result (result
(if arg (if arg
(if-let* (if-let
((handler (intern-soft (handler
(completing-read "Select lookup handler: " (intern-soft
(delete-dups (completing-read "Select lookup handler: "
(remq t (append (symbol-value handlers) (delete-dups
(default-value handlers)))) (remq t (append (symbol-value handlers)
nil t)))) (default-value handlers))))
nil t)))
(+lookup--run-handlers handler identifier origin) (+lookup--run-handlers handler identifier origin)
(user-error "No lookup handler selected")) (user-error "No lookup handler selected"))
(run-hook-wrapped handlers #'+lookup--run-handlers identifier origin)))) (run-hook-wrapped handlers #'+lookup--run-handlers identifier origin))))