From: rush Date: Tue, 7 Jul 2026 14:52:56 +0000 (-0400) Subject: Fix formatting from tangle X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=c6bddb41877fa92bdaf459e101ca66fdde2540b8;p=emacsinit.git Fix formatting from tangle --- diff --git a/init.el b/init.el index 20e3e8e..9079bff 100644 --- a/init.el +++ b/init.el @@ -107,15 +107,15 @@ (setq markdown-special-ctrl-a/e t) (with-eval-after-load 'markdown-mode - (keymap-set markdown-mode-map "M-" #'markdown-demote) - (keymap-set markdown-mode-map "M-" #'markdown-promote) - (keymap-set markdown-mode-map "M-" #'markdown-move-up) - (keymap-set markdown-mode-map "M-" #'markdown-move-down) - (keymap-set markdown-mode-map "C-M-u" #'markdown-up-heading) - (keymap-set markdown-mode-map "C-M-b" #'markdown-outline-previous-same-level) - (keymap-set markdown-mode-map "C-M-f" #'markdown-outline-next-same-level) - (keymap-set markdown-mode-map "C-M-p" #'markdown-outline-previous) - (keymap-set markdown-mode-map "C-M-n" #'markdown-outline-next)) + (keymap-set markdown-mode-map "M-" #'markdown-demote) + (keymap-set markdown-mode-map "M-" #'markdown-promote) + (keymap-set markdown-mode-map "M-" #'markdown-move-up) + (keymap-set markdown-mode-map "M-" #'markdown-move-down) + (keymap-set markdown-mode-map "C-M-u" #'markdown-up-heading) + (keymap-set markdown-mode-map "C-M-b" #'markdown-outline-previous-same-level) + (keymap-set markdown-mode-map "C-M-f" #'markdown-outline-next-same-level) + (keymap-set markdown-mode-map "C-M-p" #'markdown-outline-previous) + (keymap-set markdown-mode-map "C-M-n" #'markdown-outline-next)) ;; Sly @@ -170,22 +170,22 @@ (add-hook 'scheme-mode-hook 'geiser-mode) (with-eval-after-load 'geiser-repl - (keymap-set geiser-repl-mode-map ")" (re/send-on-close-paren #'geiser-repl-maybe-send)) - (keymap-set geiser-repl-mode-map "]" (re/balance-and-eval-sexp #'geiser-repl-maybe-send))) + (keymap-set geiser-repl-mode-map ")" (re/send-on-close-paren #'geiser-repl-maybe-send)) + (keymap-set geiser-repl-mode-map "]" (re/balance-and-eval-sexp #'geiser-repl-maybe-send))) ;; Set bindings, things that have to happen after loading (with-eval-after-load 'org - (require 'org-mouse) - (add-to-list 'org-export-backends 'md) - (keymap-set org-mode-map "C-M-h" #'org-mark-subtree) - (keymap-set org-mode-map "C-M-u" #'org-up-element) - (keymap-set org-mode-map "C-M-d" #'org-down-element) - (keymap-set org-mode-map "C-M-b" #'org-backward-heading-same-level) - (keymap-set org-mode-map "C-M-f" #'org-forward-heading-same-level) - (keymap-set org-mode-map "C-M-p" #'org-previous-visible-heading) - (keymap-set org-mode-map "C-M-n" #'org-next-visible-heading) - (keymap-set org-mode-map "C-c t" #'org-transclusion-mode)) + (require 'org-mouse) + (add-to-list 'org-export-backends 'md) + (keymap-set org-mode-map "C-M-h" #'org-mark-subtree) + (keymap-set org-mode-map "C-M-u" #'org-up-element) + (keymap-set org-mode-map "C-M-d" #'org-down-element) + (keymap-set org-mode-map "C-M-b" #'org-backward-heading-same-level) + (keymap-set org-mode-map "C-M-f" #'org-forward-heading-same-level) + (keymap-set org-mode-map "C-M-p" #'org-previous-visible-heading) + (keymap-set org-mode-map "C-M-n" #'org-next-visible-heading) + (keymap-set org-mode-map "C-c t" #'org-transclusion-mode)) (keymap-global-set "C-c l" #'org-store-link) (keymap-global-set "C-c a" #'org-agenda) @@ -218,23 +218,23 @@ ;; Agenda settings - (setq org-agenda-files (append '("~/org/") +(setq org-agenda-files (append '("~/org/") (file-expand-wildcards "~/projects/*/")) - org-refile-targets '((nil :maxlevel . 9) + org-refile-targets '((nil :maxlevel . 9) (org-agenda-files :maxlevel . 9)) - org-todo-keywords '((sequence "TODO(t)" "WAITING(w@)" "|" "DONE(d)" "BELAYED(b@)" "GIVEN(g@)")) - org-todo-keyword-faces '(("WAITING" :foreground "#e85400" :weight bold)) ; alert orange - org-agenda-prefix-format '((agenda . " %?-12t%? s") + org-todo-keywords '((sequence "TODO(t)" "WAITING(w@)" "|" "DONE(d)" "BELAYED(b@)" "GIVEN(g@)")) + org-todo-keyword-faces '(("WAITING" :foreground "#e85400" :weight bold)) ; alert orange + org-agenda-prefix-format '((agenda . " %?-12t%? s") (todo . " ") (tags . " ") (search . " ")) - org-agenda-start-on-weekday nil - org-read-date-prefer-future 'time - org-log-done 'time - org-log-redeadline 'time - org-log-reschedule 'time - org-log-state-notes-insert-after-drawers t - org-agenda-window-setup 'current-window) + org-agenda-start-on-weekday nil + org-read-date-prefer-future 'time + org-log-done 'time + org-log-redeadline 'time + org-log-reschedule 'time + org-log-state-notes-insert-after-drawers t + org-agenda-window-setup 'current-window) ;; Stuck Projects @@ -242,26 +242,26 @@ ;; Custom Agendas - (defvar *re/org-agenda-inbox* - '(tags "CATEGORY=\"inbox\"" ((org-agenda-overriding-header "")))) +(defvar *re/org-agenda-inbox* + '(tags "CATEGORY=\"inbox\"" ((org-agenda-overriding-header "")))) - (defvar *re/org-agenda-todo* - '(tags-todo "-recurring/TODO" ((org-agenda-overriding-header "")))) +(defvar *re/org-agenda-todo* + '(tags-todo "-recurring/TODO" ((org-agenda-overriding-header "")))) - (defvar *re/org-agenda-undertakings* - '(tags "CATEGORY=\"undertakings\"+LEVEL=1" ((org-agenda-overriding-header "")))) +(defvar *re/org-agenda-undertakings* + '(tags "CATEGORY=\"undertakings\"+LEVEL=1" ((org-agenda-overriding-header "")))) - (defvar *re/org-agenda-waiting* - '(todo "WAITING" ((org-agenda-overriding-header "")))) +(defvar *re/org-agenda-waiting* + '(todo "WAITING" ((org-agenda-overriding-header "")))) (defvar *re/org-agenda-done* '(tags "-recurring+LEVEL=1/DONE|BELAYED|GIVEN")) - (setq org-agenda-custom-commands `(("i" "Inbox" ,@*re/org-agenda-inbox*) - ("n" "Next Actions" ,@*re/org-agenda-todo*) - ("u" "Undertakings" ,@*re/org-agenda-undertakings*) - ("w" "Waiting" ,@*re/org-agenda-waiting*) - ("d" "Done" ,@*re/org-agenda-done*))) +(setq org-agenda-custom-commands `(("i" "Inbox" ,@*re/org-agenda-inbox*) + ("n" "Next Actions" ,@*re/org-agenda-todo*) + ("u" "Undertakings" ,@*re/org-agenda-undertakings*) + ("w" "Waiting" ,@*re/org-agenda-waiting*) + ("d" "Done" ,@*re/org-agenda-done*))) ;; Capture Templates @@ -329,9 +329,11 @@ This command requires that pandoc (man page `pandoc(1)') be installed." (interactive "r") - (shell-command-on-region - start end - "pandoc -f markdown -t org --wrap=preserve" t t)) + (shell-command-on-region start + end + "pandoc -f markdown -t org --wrap=preserve" + t + t)) ;; Converting org to markdown @@ -340,17 +342,19 @@ installed." This command requires that pandoc (man page `pandoc(1)') be installed." (interactive "r") - (shell-command-on-region - start end - "pandoc -f org -t markdown --wrap=preserve" t t)) + (shell-command-on-region start + end + "pandoc -f org -t markdown --wrap=preserve" + t + t)) ;; Trashed ;; Shows the trash file as a dired buffer (setq trashed-action-confirmer 'y-or-n-p - trashed-use-header-line t - trashed-sort-key '("Date deleted" . t) - trashed-date-format "%Y-%m-%d %H:%M:%S") + trashed-use-header-line t + trashed-sort-key '("Date deleted" . t) + trashed-date-format "%Y-%m-%d %H:%M:%S") ;; Use mu4e on my home pcs @@ -485,7 +489,8 @@ installed." tab-width 8 backward-delete-char-untabify-method nil) -(advice-add 'indent-to :around +(advice-add 'indent-to + :around (lambda (orig-fun column &rest args) (when indent-tabs-mode (setq column (* tab-width (round column tab-width)))) @@ -606,14 +611,13 @@ If in org-mode, call `org-beginning-of-line' first." (defun re/smart-end-of-line () "Move point to the end of the visual line. - If point was already at that position, call `move-end-of-line'. +If point was already at that position, call `move-end-of-line'. If in org-mode, call `org-end-of-line' first." (interactive "^") (let ((oldpos (point))) (if (equal major-mode 'org-mode) (org-end-of-line) - (when visual-line-mode - (end-of-visual-line 1))) + (when visual-line-mode (end-of-visual-line 1))) (and (= oldpos (point)) (move-end-of-line nil)))) (keymap-global-set " " #'re/smart-end-of-line)