From 2fdfc43684595b6dc38ca60d2e5a42a1948dd8f3 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sat, 27 Mar 2021 12:29:54 -0500 Subject: [PATCH] bleh --- init.el | 13 +++++++------ lisp/acdw.el | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/init.el b/init.el index c8b4404..8f2bc12 100644 --- a/init.el +++ b/init.el @@ -3,7 +3,7 @@ ;; Created: Sometime during Covid-19, 2020 ;; Keywords: configuration ;; URL: https://tildegit.org/acdw/emacs -;; Bankruptcy: 5c +;; Bankruptcy: 5d ;; This file is NOT part of GNU Emacs. @@ -402,11 +402,12 @@ :set '((elpher-ipv4-always t) (elpher-certificate-directory (acdw/in-var "elpher/"))) - :binds (("n" elpher-next-link :map elpher-mode-map) - ("p" elpher-prev-link :map elpher-mode-map) - ("o" elpher-follow-current-link :map elpher-mode-map) - ("G" elpher-go-current :map elpher-mode-map)) - :now ((when (boundp 'god-exempt-major-modes) + :now ((acdw/bind-after-map "elpher" elpher-mode-map + (("n" elpher-next-link :map-after "elpher") + ("p" elpher-prev-link :map-after "elpher") + ("o" elpher-follow-current-link :map-after "elpher") + ("G" elpher-go-current :map-after "elpher"))) + (when (boundp 'god-exempt-major-modes) (add-to-list 'god-exempt-major-modes 'elpher-mode)))) (acdw/pkg (gemini-mode diff --git a/lisp/acdw.el b/lisp/acdw.el index bd6c02a..62778e3 100644 --- a/lisp/acdw.el +++ b/lisp/acdw.el @@ -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)))