aboutsummaryrefslogtreecommitdiff
path: root/modules/prog-general.el
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-06-15 21:34:09 -0500
committerCraig Jennings <c@cjennings.net>2026-06-15 21:34:09 -0500
commit9987756fcb4c7d12eb0f6338fdaeeaddfd8ff519 (patch)
tree71f270cd558f0ba9dfdcb0a4de1bf105c186d5f8 /modules/prog-general.el
parent7407ebeae112462104c8c7855d65cf621c88ab94 (diff)
downloaddotemacs-9987756fcb4c7d12eb0f6338fdaeeaddfd8ff519.tar.gz
dotemacs-9987756fcb4c7d12eb0f6338fdaeeaddfd8ff519.zip
fix(prog): keep electric-pair and line-number setup buffer-local
- Go/C/shell setup hooks called the global electric-pair-mode, so one prog buffer turned pairing on in org and text everywhere. Use electric-pair-local-mode. - prog-general set display-line-numbers-type inside the hook, after the mode turned on, so the first prog buffer of a session got absolute numbers. Set the type and width at top level instead. - Updated the go/c tests to stub the local mode.
Diffstat (limited to 'modules/prog-general.el')
-rw-r--r--modules/prog-general.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/prog-general.el b/modules/prog-general.el
index cb46ce6b8..53f20ce46 100644
--- a/modules/prog-general.el
+++ b/modules/prog-general.el
@@ -72,12 +72,16 @@
;; --------------------- General Programming Mode Settings ---------------------
;; keybindings, minor-modes, and prog-mode settings
+;; Set the line-number type and width before any prog buffer enables
+;; display-line-numbers-mode. Setting them inside the hook ran after the mode
+;; turned on, so the first prog buffer of a session got absolute numbers.
+(setq display-line-numbers-type 'relative) ;; numbers relative to point
+(setq-default display-line-numbers-width 3) ;; 3 chars reserved for numbers
+
(defun cj/general-prog-settings ()
"Keybindings, minor modes, and settings for programming mode."
(interactive)
(display-line-numbers-mode) ;; show line numbers
- (setq display-line-numbers-type 'relative) ;; display numbers relative to 'the point'
- (setq-default display-line-numbers-width 3) ;; 3 characters reserved for line numbers
(turn-on-visual-line-mode) ;; word-wrapping
(auto-fill-mode) ;; auto wrap at the fill column set
(local-set-key (kbd "M-;") 'comment-dwim) ;; comment/uncomment region as appropriate