Merge branch 'main' of https://tildegit.org/acdw/emacs

1 files changed, 23 insertions, 6 deletions

@@ -34,10 +34,15 @@
            "C-x 4 n" #'clone-buffer
            "C-c v" #'visible-mode
            "C-M-;" #'+lisp-comment-or-uncomment-sexp
-           "M-j" nil)
+           "M-j" nil
+           "C-x o" (lambda () (interactive) (switch-to-buffer nil))
+           "C-x C-o" #'+open-paragraph
+           "C-w" #'+kill-word-backward-or-region)
   ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults
   (global-set-key (kbd "C-h") 'delete-backward-char)
   (keyboard-translate ?\C-h ?\C-?)
+  ;; Hooks
+  ;; Advice
   ;; https://old.reddit.com/r/emacs/comments/rlli0u/whats_your_favorite_defadvice/hph14un/
   (define-advice keyboard-escape-quit (:around (fn &rest r))
     "Don't close splits on `keyboard-escape-quit'."
@@ -104,6 +109,9 @@
 (setup (:require reading)
   (:global "C-c C-r" #'reading-mode))
 
+(setup (:require user-save)
+  (user-save-mode +1))
+
 (setup +key
   (+ensure-after-init #'+key-global-mode))
 
@@ -450,7 +458,7 @@
          "C-c C-l" #'+org-insert-link-dwim
          "C-c C-n" #'+org-next-heading-widen
          "C-c C-p" #'+org-previous-heading-widen)
-  (:local-hook before-save-hook #'+org-before-save@prettify-buffer)
+  (:local-hook user-save-hook #'+org-before-save@prettify-buffer)
   (advice-add #'org-delete-backward-char :override #'+org-delete-backward-char)
   (with-eval-after-load 'org
     (org-clock-persistence-insinuate)
@@ -584,6 +592,7 @@
   (:require _circe
             +circe)
   (:also-load circe-chanop)
+  (+ensure-after-init (lambda () (defalias 'irc '+irc "Start IRC.")))
 
   ;; Formatting options
   (:option
@@ -704,7 +713,11 @@
     (add-to-list '+pulse-location-commands #'lui-track-jump-to-indicator)
     (:hook #'visual-line-mode
            #'enable-lui-track
-           #'visual-fill-column-mode)
+           #'visual-fill-column-mode
+           (defun +disable-electric-pair-mode ()
+             "Disable `electric-pair-mode' in the current buffer."
+             (interactive)
+             (electric-pair-local-mode -1)))
     (:local-set fringes-outside-margins t
                 right-margin-width (length lui-time-stamp-format)
                 scroll-margin 0
@@ -948,9 +961,11 @@ See also `crux-reopen-as-root-mode'."
   (:+key "M-q" #'filldent-dwim))
 
 (setup (:straight flyspell-correct)
+  (:+also-load +flyspell-correct )
   (:option flyspell-correct--cr-key ";")
   (:bind-into flyspell
-    "C-;" #'flyspell-correct-wrapper))
+    "C-;" #'flyspell-correct-wrapper
+    "<f7>" #'+flyspell-correct-buffer))
 
 (setup (:straight-when (forge
                         :host github :repo "magit/forge")
@@ -1136,7 +1151,9 @@ See also `crux-reopen-as-root-mode'."
 
 (setup (:straight paredit)
   (:bind "DEL" #'paredit-backward-delete
-         "C-<backspace>" #'paredit-backward-kill-word)
+         "C-<backspace>" #'paredit-backward-kill-word
+         "C-w" (lambda (r) (interactive "P")
+                 (+kill-word-backward-or-region r #'paredit-backward-kill-word)))
   (dolist (hook '(emacs-lisp-mode-hook
                   eval-expression-minibuffer-setup-hook
                   ielm-mode-hook
@@ -1225,7 +1242,7 @@ See also `crux-reopen-as-root-mode'."
                    :host github
                    :repo "duckwork/titlecase.el"
                    :files ("*")))
-  (:with-map +casing-map
+  (:with-map +casing-mode-map
     (:bind "t" #'titlecase-dwim)))
 
 (setup (:straight topsy)