summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-09-04 23:54:12 -0500
committerCase Duckworth2021-09-04 23:54:12 -0500
commitb0c3c90e9e173ada14073b90c2ff5d6d25ed0da3 (patch)
treebff3d076ce3f10ed8b9b1e712a232dcd06e2068f
parentAdd :face (diff)
downloademacs-b0c3c90e9e173ada14073b90c2ff5d6d25ed0da3.tar.gz
emacs-b0c3c90e9e173ada14073b90c2ff5d6d25ed0da3.zip
Whitespace ... more
-rw-r--r--init.el35
-rw-r--r--lisp/acdw-re.el4
2 files changed, 29 insertions, 10 deletions
diff --git a/init.el b/init.el index 73f4744..e5b7796 100644 --- a/init.el +++ b/init.el
@@ -325,6 +325,7 @@ AKA, DO NOT USE THIS FUNCTION!!!"
325 "<help> a" #'consult-apropos 325 "<help> a" #'consult-apropos
326 ;; Isearch integration 326 ;; Isearch integration
327 "M-s e" #'consult-isearch) 327 "M-s e" #'consult-isearch)
328
328 (:with-map isearch-mode-map 329 (:with-map isearch-mode-map
329 (:bind "M-e" #'consult-isearch 330 (:bind "M-e" #'consult-isearch
330 "M-s e" #'consult-isearch 331 "M-s e" #'consult-isearch
@@ -941,19 +942,34 @@ successive invocations."
941 (add-to-list 'auto-mode-alist '("\\.fs\\'" . forth-mode)) 942 (add-to-list 'auto-mode-alist '("\\.fs\\'" . forth-mode))
942 (add-to-list 'auto-mode-alist '("\\.fb\\'" . forth-block-mode))) 943 (add-to-list 'auto-mode-alist '("\\.fb\\'" . forth-block-mode)))
943 944
945
944(setup goto-addr 946(setup goto-addr
945 (if (fboundp #'global-goto-address-mode) 947 (if (fboundp #'global-goto-address-mode)
946 (global-goto-address-mode) 948 (global-goto-address-mode)
947 (add-hook 'after-change-major-mode-hook #'goto-address-mode))) 949 (add-hook 'after-change-major-mode-hook #'goto-address-mode)))
948 950
949
950;; TODO: figure out a popper.el / shackle.el ... thing to fix this 951;; TODO: figure out a popper.el / shackle.el ... thing to fix this
951(setup (:straight helpful) 952(setup (:straight helpful)
952 (:option helpful-max-buffers 5) 953 (:option helpful-switch-buffer-function
954 (defun helpful-pop-to-buffer (&rest args)
955 (let ((foo
956 (if (eq major-mode 'helpful-mode)
957 #'pop-to-buffer-same-window
958 #'pop-to-buffer)))
959 (apply foo args))))
960
953 (:global "<help> f" #'helpful-callable 961 (:global "<help> f" #'helpful-callable
954 "<help> v" #'helpful-variable 962 "<help> v" #'helpful-variable
955 "<help> k" #'helpful-key 963 "<help> k" #'helpful-key
956 "<help> o" #'helpful-symbol)) 964 "<help> o" #'helpful-symbol)
965
966 (:bind "q" (defun helpful-quit ()
967 (interactive)
968 (when (eq major-mode 'helpful-mode)
969 (quit-window)
970 (unless (or (= 1 (count-windows))
971 (eq major-mode 'helpful-mode))
972 (delete-window))))))
957 973
958(setup (:straight hungry-delete) 974(setup (:straight hungry-delete)
959 (:option hungry-delete-chars-to-skip " \t" 975 (:option hungry-delete-chars-to-skip " \t"
@@ -1366,7 +1382,7 @@ browser defined in `browse-url-secondary-browser-function'."
1366 (add-hook (intern (concat (symbol-name mode) "-hook")) 1382 (add-hook (intern (concat (symbol-name mode) "-hook"))
1367 #'paredit@setup)) 1383 #'paredit@setup))
1368 1384
1369 (:also-load 'eldoc) 1385 (:also-load eldoc)
1370 (eldoc-add-command 'paredit-backward-delete 'paredit-close-round)) 1386 (eldoc-add-command 'paredit-backward-delete 'paredit-close-round))
1371 1387
1372(setup (:straight paren-face) 1388(setup (:straight paren-face)
@@ -1711,9 +1727,8 @@ If used with a numeric prefix argument N, N backticks will be inserted."
1711 (:advise variable-pitch-mode :after 1727 (:advise variable-pitch-mode :after
1712 (defun variable-pitch-mode@setup (&rest _) 1728 (defun variable-pitch-mode@setup (&rest _)
1713 "Set up `variable-pitch-mode' with my customizations." 1729 "Set up `variable-pitch-mode' with my customizations."
1714 (display-fill-column-indicator-mode (if buffer-face-mode 1730 (display-fill-column-indicator-mode
1715 -1 1731 (if buffer-face-mode -1 +1)))))
1716 +1)))))
1717 1732
1718(setup (:straight (vertico 1733(setup (:straight (vertico
1719 :host github 1734 :host github
@@ -1804,8 +1819,10 @@ If used with a numeric prefix argument N, N backticks will be inserted."
1804 (which-key-mode +1)) 1819 (which-key-mode +1))
1805 1820
1806(setup whitespace 1821(setup whitespace
1807 (:option whitespace-style 1822 (:option whitespace-style '(empty
1808 '(empty indentation space-before-tab space-after-tab) 1823 indentation
1824 space-before-tab
1825 space-after-tab)
1809 indent-tabs-mode nil 1826 indent-tabs-mode nil
1810 tab-width 4 1827 tab-width 4
1811 backward-delete-char-untabify-method 'hungry) 1828 backward-delete-char-untabify-method 'hungry)
diff --git a/lisp/acdw-re.el b/lisp/acdw-re.el index ea1c42a..f7df241 100644 --- a/lisp/acdw-re.el +++ b/lisp/acdw-re.el
@@ -48,7 +48,9 @@ surrounded by word boundaries."
48 "") 48 "")
49 " regexp" 49 " regexp"
50 (if (with-selected-window reb-target-window 50 (if (with-selected-window reb-target-window
51 (region-active-p)) " in region" "")) 51 (region-active-p))
52 " in region"
53 ""))
52 t)) 54 t))
53 (pnt (car acdw/re-builder-positions)) 55 (pnt (car acdw/re-builder-positions))
54 (beg (cadr acdw/re-builder-positions)) 56 (beg (cadr acdw/re-builder-positions))