Add `defun-with-hooks'

1 files changed, 15 insertions, 2 deletions

@@ -101,10 +101,15 @@
       word-wrap t
       truncate-lines nil)
 (add-hook 'text-mode-hook #'turn-on-auto-fill)
-(add-hook 'prog-mode-hook #'turn-on-auto-fill)
 (global-display-fill-column-indicator-mode +1)
 (global-so-long-mode +1)
 
+;; Only fill comments in prog-mode.
+(defun-with-hooks '(prog-mode)
+  (defun hook--auto-fill-prog-mode ()
+    (setq-local comment-auto-fill-only-comments t)
+    (turn-on-auto-fill)))
+
 ;;;; Whitespace
 (setc whitespace-style
       '(empty indentation space-before-tab space-after-tab)
@@ -118,7 +123,6 @@
       show-paren-style 'mixed
       show-paren-when-point-inside-paren t
       show-paren-when-point-in-periphery t)
-(show-paren-mode +1)
 (add-hook 'prog-mode-hook #'electric-pair-local-mode)
 
 ;;;; Killing and yanking
@@ -371,6 +375,15 @@
         w32-pass-apps-to-system nil
         w32-apps-modifier 'hyper))
 
+;;;; Set up non-special modes
+;; Great idea from brause.cc
+(defun-with-hooks '(text-mode-hook prog-mode-hook diff-mode-hook)
+  (defun hook--setup-regular-modes ()
+    (setq indicate-empty-lines t
+          indicate-buffer-boundaries '((top . right) (bottom . right)))
+    (goto-address-mode +1)
+    (show-paren-mode +1)))
+
 ;;;; Etc. good defaults
 (setc custom-file (acdw/in-dir "custom.el")
       inhibit-startup-screen t