From 870d1595e4137b84481df678cf41871dfde1fbbd Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Thu, 25 Mar 2021 12:03:59 -0500 Subject: White space --- early-init.el | 78 +++++++++++++++++------------------ lisp/acdw.el | 130 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/early-init.el b/early-init.el index d803c89..4037ef8 100644 --- a/early-init.el +++ b/early-init.el @@ -47,7 +47,7 @@ "Reset `gc-cons-threshold', `gc-cons-percentage', and `file-name-handler-alist' to their defaults after init." (setq gc-cons-threshold gc-cons-threshold-basis - gc-cons-percentage gc-cons-percentage-basis) + gc-cons-percentage gc-cons-percentage-basis) (dolist (handler file-name-handler-alist) (add-to-list 'orig-file-name-handler-alist handler)) (setq file-name-handler-alist orig-file-name-handler-alist)) @@ -58,33 +58,33 @@ (setq default-frame-alist ; Remove most UI `((tool-bar-lines . 0) ; No tool bar - (menu-bar-lines . 0) ; No menu bar - (vertical-scroll-bars) ; No scroll bars - (horizontal-scroll-bars) ; ... at all - (width . 84) ; A /little/ wider than - ; `fill-column' (set later) - (height . 30) - (left-fringe . 8) ; Width of fringes - (right-fringe . 8) ; (8 is default) - (font . ,(pcase acdw/system - (:home "DejaVu Sans Mono 10") - (:work "Consolas 10")))) - frame-inhibit-implied-resize t ; Don't resize randomly - frame-resize-pixelwise t ; Resize by pixels, not chars - ) + (menu-bar-lines . 0) ; No menu bar + (vertical-scroll-bars) ; No scroll bars + (horizontal-scroll-bars) ; ... at all + (width . 84) ; A /little/ wider than + ; `fill-column' (set later) + (height . 30) + (left-fringe . 8) ; Width of fringes + (right-fringe . 8) ; (8 is default) + (font . ,(pcase acdw/system + (:home "DejaVu Sans Mono 10") + (:work "Consolas 10")))) + frame-inhibit-implied-resize t ; Don't resize randomly + frame-resize-pixelwise t ; Resize by pixels, not chars + ) (defun hook--disable-ui-modes () "Disable frame UI using modes, for toggling later." (dolist (mode ;; each mode is of the form (MODE . FRAME-ALIST-VAR) - '((tool-bar-mode . tool-bar-lines) - (menu-bar-mode . menu-bar-lines) - (scroll-bar-mode . vertical-scroll-bars) - (horizontal-scroll-bar-mode . horizontal-scroll-bars) - )) + '((tool-bar-mode . tool-bar-lines) + (menu-bar-mode . menu-bar-lines) + (scroll-bar-mode . vertical-scroll-bars) + (horizontal-scroll-bar-mode . horizontal-scroll-bars) + )) (let ((setting (alist-get (cdr mode) default-frame-alist))) (when (or (not setting) - (= 0 setting)) - (funcall (car mode) -1))))) + (= 0 setting)) + (funcall (car mode) -1))))) (add-hook 'after-init-hook #'hook--disable-ui-modes) @@ -92,11 +92,11 @@ ;; 1. Update `exec-path'. (dolist (path (list (expand-file-name "bin" user-emacs-directory) - (expand-file-name "~/bin") - (expand-file-name "~/.local/bin") - (expand-file-name "~/usr/bin") - (expand-file-name "~/cmd") - (expand-file-name "~/mingw64/bin"))) + (expand-file-name "~/bin") + (expand-file-name "~/.local/bin") + (expand-file-name "~/usr/bin") + (expand-file-name "~/cmd") + (expand-file-name "~/mingw64/bin"))) (when (file-exists-p path) (add-to-list 'exec-path path :append))) @@ -105,10 +105,10 @@ ;; 2. Set `package' and `straight' variables. (setq package-enable-at-startup nil ; not sure if strictly - ; necessary + ; necessary package-quickstart nil ; ditto straight-host-usernames '((github . "duckwork") - (gitlab . "acdw")) + (gitlab . "acdw")) straight-base-dir acdw/dir ; don't clutter ~/.emacs.d ) @@ -116,15 +116,15 @@ (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name - "straight/repos/straight.el/bootstrap.el" - straight-base-dir)) + "straight/repos/straight.el/bootstrap.el" + straight-base-dir)) (bootstrap-version 5)) (unless (file-exists-p bootstrap-file) (with-current-buffer - (url-retrieve-synchronously - (concat "https://raw.githubusercontent.com/" - "raxod502/straight.el/develop/install.el") - 'silent 'inhibit-cookies) + (url-retrieve-synchronously + (concat "https://raw.githubusercontent.com/" + "raxod502/straight.el/develop/install.el") + 'silent 'inhibit-cookies) (goto-char (point-max)) (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) @@ -134,10 +134,10 @@ (defun hook--message-startup-time () "Show Emacs's startup time in the message buffer. For profiling." (message "Emacs ready in %s with %d garbage collections." - (format "%.2f seconds" - (float-time (time-subtract after-init-time - before-init-time))) - gcs-done)) + (format "%.2f seconds" + (float-time (time-subtract after-init-time + before-init-time))) + gcs-done)) (add-hook 'emacs-startup-hook #'hook--message-startup-time) diff --git a/lisp/acdw.el b/lisp/acdw.el index 4493275..bd6c02a 100644 --- a/lisp/acdw.el +++ b/lisp/acdw.el @@ -37,20 +37,20 @@ Ready for use with `after-focus-change-function'." (defun acdw/sunrise-sunset (sunrise-command sunset-command) "Run commands at sunrise and sunset." (let* ((times-regex (rx (* nonl) - (: (any ?s ?S) "unrise") " " - (group (repeat 1 2 digit) ":" - (repeat 1 2 digit) - (: (any ?a ?A ?p ?P) (any ?m ?M))) - (* nonl) - (: (any ?s ?S) "unset") " " - (group (repeat 1 2 digit) ":" - (repeat 1 2 digit) - (: (any ?a ?A ?p ?P) (any ?m ?M))) - (* nonl))) - (ss (sunrise-sunset)) - (_m (string-match times-regex ss)) - (sunrise-time (match-string 1 ss)) - (sunset-time (match-string 2 ss))) + (: (any ?s ?S) "unrise") " " + (group (repeat 1 2 digit) ":" + (repeat 1 2 digit) + (: (any ?a ?A ?p ?P) (any ?m ?M))) + (* nonl) + (: (any ?s ?S) "unset") " " + (group (repeat 1 2 digit) ":" + (repeat 1 2 digit) + (: (any ?a ?A ?p ?P) (any ?m ?M))) + (* nonl))) + (ss (sunrise-sunset)) + (_m (string-match times-regex ss)) + (sunrise-time (match-string 1 ss)) + (sunset-time (match-string 2 ss))) (run-at-time sunrise-time (* 60 60 24) sunrise-command) (run-at-time sunset-time (* 60 60 24) sunset-command) (run-at-time "12:00am" (* 60 60 24) sunset-command))) @@ -58,15 +58,15 @@ Ready for use with `after-focus-change-function'." ;;; Directories (think `no-littering') (defvar acdw/dir (expand-file-name - (convert-standard-filename "var/") - user-emacs-directory) + (convert-standard-filename "var/") + user-emacs-directory) "A directory to hold extra configuration and emacs data.") (defun acdw/in-dir (file &optional make-directory) "Expand FILE relative to `acdw/dir', optionally creating its directory." (let ((f (expand-file-name (convert-standard-filename file) - acdw/dir))) + acdw/dir))) (when make-directory (make-directory (file-name-directory f) 'parents)) f)) @@ -81,11 +81,11 @@ ASSIGNMENTS is a list where each element is of the form (let (setting) ; for return value (dolist (assignment assignments setting) (customize-set-variable (car assignment) - (cadr assignment) - (if (and (caddr assignment) - (stringp (caddr assignment))) - (caddr assignment) - "Customized by `acdw/set'.")) + (cadr assignment) + (if (and (caddr assignment) + (stringp (caddr assignment))) + (caddr assignment) + "Customized by `acdw/set'.")) (setq setting (car assignment))))) ;;; Faces @@ -118,19 +118,19 @@ ARGS accept the following keywords: :after FEATURE .. `autoload' all functions after FEATURE." (let ((after (plist-get args :after)) - (command-list)) + (command-list)) (dolist (spec hook-specs) (let* ((hooks (car spec)) - (funcs (cadr spec)) - (depth (or (caddr spec) 0)) - (local (cadddr spec))) - (when (not (listp hooks)) (setq hooks (list hooks))) - (when (not (listp funcs)) (setq funcs (list funcs))) - (dolist (hook hooks) - (dolist (func funcs) - (push `(add-hook ',hook #',func ,depth ,local) command-list) - (when after - (push `(autoload #',func ,after) command-list)))))) + (funcs (cadr spec)) + (depth (or (caddr spec) 0)) + (local (cadddr spec))) + (when (not (listp hooks)) (setq hooks (list hooks))) + (when (not (listp funcs)) (setq funcs (list funcs))) + (dolist (hook hooks) + (dolist (func funcs) + (push `(add-hook ',hook #',func ,depth ,local) command-list) + (when after + (push `(autoload #',func ,after) command-list)))))) `(progn ,@command-list))) @@ -161,25 +161,25 @@ The following keywords are recognized: defined in a different file than the command it binds (looking at you, `org-mode')." (let ((after (when-let (sym (plist-get args :after)) - (if (not (listp sym)) - (list sym) - sym))) - (map-after (plist-get args :map-after)) - (keymap (or (plist-get args :map) acdw/bind-default-map)) - (keycode (if (vectorp key) key (kbd key))) - (command-list)) + (if (not (listp sym)) + (list sym) + sym))) + (map-after (plist-get args :map-after)) + (keymap (or (plist-get args :map) acdw/bind-default-map)) + (keycode (if (vectorp key) key (kbd key))) + (command-list)) (let ((define-key-command `(define-key ,keymap ,keycode ',command))) (if map-after - (push `(with-eval-after-load ,map-after - ,define-key-command) - command-list) - (push define-key-command command-list))) + (push `(with-eval-after-load ,map-after + ,define-key-command) + command-list) + (push define-key-command command-list))) (when after (unless (fboundp command) - (push `(autoload ',command ,@after) command-list)) + (push `(autoload ',command ,@after) command-list)) (unless (or map-after - (eq keymap acdw/bind-default-map)) - (push `(autoload ',keymap ,(car after) nil nil 'keymap) command-list))) + (eq keymap acdw/bind-default-map)) + (push `(autoload ',keymap ,(car after) nil nil 'keymap) command-list))) `(progn ,@command-list))) @@ -197,9 +197,9 @@ The following keywords are recognized: KEYMAP can be nil." (declare (indent 2)) (let ((bind-list) - (extra-args (if keymap - `(:after ,file :map ,keymap) - `(:after ,file)))) + (extra-args (if keymap + `(:after ,file :map ,keymap) + `(:after ,file)))) (dolist (binding bindings) (push `(acdw/bind ,@binding ,@extra-args) bind-list)) `(progn @@ -213,34 +213,34 @@ KEYMAP can be nil." ARGS can include the following keywords: :local BOOL .. if BOOL is non-nil, don't run `straight-use-package' on - PACKAGE. Good for using `acdw/pkg' on local features. + PACKAGE. Good for using `acdw/pkg' on local features. :require BOOL .. if BOOL is non-nil, run `require' on PACKAGE before anything. :now FORMS .. run FORMS immediately. :then FORMS .. run FORMS after loading PACKAGE, using `with-eval-after-load'. :set SETTINGS .. pass SETTINGS to `acdw/set', right after `:now' forms. - SETTINGS should be properly quoted, just like they'd be passed - to the function. + SETTINGS should be properly quoted, just like they'd be passed + to the function. :binds BINDS .. run `acdw/bind-after-map' on BINDS. :hooks HOOKS .. run `acdw/hooks' on HOOKS." (declare (indent 1)) (let ((local-pkg (plist-get args :local)) - (require-pkg (plist-get args :require)) - (now-forms (plist-get args :now)) - (settings (plist-get args :set)) - (binds (plist-get args :binds)) - (hooks (plist-get args :hooks)) - (then-forms (plist-get args :then)) - (requirement (if (listp package) - (car package) - package)) - (final-form)) + (require-pkg (plist-get args :require)) + (now-forms (plist-get args :now)) + (settings (plist-get args :set)) + (binds (plist-get args :binds)) + (hooks (plist-get args :hooks)) + (then-forms (plist-get args :then)) + (requirement (if (listp package) + (car package) + package)) + (final-form)) (when then-forms (push `(with-eval-after-load ',requirement ,@then-forms) final-form)) (when hooks (push `(acdw/hooks ,hooks :after ,(symbol-name requirement)) final-form)) (when binds (push `(acdw/bind-after-map ,(symbol-name requirement) nil ,binds) - final-form)) + final-form)) (when settings (push `(acdw/set ,settings) final-form)) (when now-forms @@ -273,7 +273,7 @@ ARGS can include the following keywords: ;; Set up a leader key for `acdw/mode' (defvar acdw/leader (let ((map (make-sparse-keymap)) - (c-z (global-key-binding "\C-z"))) + (c-z (global-key-binding "\C-z"))) (define-key acdw/map "\C-z" map) (define-key map "\C-z" c-z) map)) -- cgit 1.4.1-21-gabe81