From 1c2d20fc1831b9e39410eb943ef09e8fe9931256 Mon Sep 17 00:00:00 2001
From: Ashton Wiersdorf <mail@wiersdorf.dev>
Date: Tue, 7 Nov 2023 10:32:45 -0700
Subject: setq → setopt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
`setq' is the normal way to set lisp variables, but it won't trigger any hooks
that might have been set for use with customize. The alternative is to use
`customize-set-variable' but that's a mouthful and it's hard to remember when to
use this. `setopt' just does The Right Thing™.
---
early-init.el | 1 -
init.el | 70 +++++++++++++++++++++++++++++------------------------------
2 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/early-init.el b/early-init.el
index f6bc9d5..08bf438 100644
--- a/early-init.el
+++ b/early-init.el
@@ -38,4 +38,3 @@
(background-color . "#000000")
(ns-appearance . dark)
(ns-transparent-titlebar . t)))
-
diff --git a/init.el b/init.el
index 468eb95..a824c79 100644
--- a/init.el
+++ b/init.el
@@ -43,17 +43,17 @@
;; (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t))
;; If you want to turn off the welcome screen, uncomment this
-;(setq inhibit-splash-screen t)
+;(setopt inhibit-splash-screen t)
-(setq initial-major-mode 'fundamental-mode) ; default mode for the *scratch* buffer
-(setq display-time-default-load-average nil) ; this information is useless for most
+(setopt initial-major-mode 'fundamental-mode) ; default mode for the *scratch* buffer
+(setopt display-time-default-load-average nil) ; this information is useless for most
;; Automatically reread from disk if the underlying file changes
-(customize-set-variable 'auto-revert-avoid-polling t)
+(setopt auto-revert-avoid-polling t)
;; Some systems don't do file notifications well; see
;; https://todo.sr.ht/~ashton314/emacs-bedrock/11
-(setq auto-revert-interval 5)
-(setq auto-revert-check-vc-info t)
+(setopt auto-revert-interval 5)
+(setopt auto-revert-check-vc-info t)
(global-auto-revert-mode)
;; Save history of minibuffer
@@ -63,7 +63,7 @@
(windmove-default-keybindings 'control) ; You can use other modifiers here
;; Fix archaic defaults
-(setq sentence-end-double-space nil)
+(setopt sentence-end-double-space nil)
;; Make right-click do something sensible
(when (display-graphic-p)
@@ -79,7 +79,7 @@ If the new path's directories does not exist, create them."
(backupFilePath (replace-regexp-in-string "//" "/" (concat backupRootDir filePath "~") )))
(make-directory (file-name-directory backupFilePath) (file-name-directory backupFilePath))
backupFilePath))
-(setq make-backup-file-name-function 'bedrock--backup-file-name)
+(setopt make-backup-file-name-function 'bedrock--backup-file-name)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
@@ -105,19 +105,19 @@ If the new path's directories does not exist, create them."
;; For help, see: https://www.masteringemacs.org/article/understanding-minibuffer-completion
-(setq enable-recursive-minibuffers t) ; Use the minibuffer whilst in the minibuffer
-(setq completion-cycle-threshold 1) ; TAB cycles candidates
-(setq completions-detailed t) ; Show annotations
-(setq tab-always-indent 'complete) ; When I hit TAB, try to complete, otherwise, indent
-(setq completion-styles '(basic initials substring)) ; Different styles to match input to candidates
+(setopt enable-recursive-minibuffers t) ; Use the minibuffer whilst in the minibuffer
+(setopt completion-cycle-threshold 1) ; TAB cycles candidates
+(setopt completions-detailed t) ; Show annotations
+(setopt tab-always-indent 'complete) ; When I hit TAB, try to complete, otherwise, indent
+(setopt completion-styles '(basic initials substring)) ; Different styles to match input to candidates
-(setq completion-auto-help 'always) ; Open completion always; `lazy' another option
-(setq completions-max-height 20) ; This is arbitrary
-(setq completions-detailed t)
-(setq completions-format 'one-column)
-(setq completions-group t)
-(setq completion-auto-select 'second-tab) ; Much more eager
-;(setq completion-auto-select t) ; See `C-h v completion-auto-select' for more possible values
+(setopt completion-auto-help 'always) ; Open completion always; `lazy' another option
+(setopt completions-max-height 20) ; This is arbitrary
+(setopt completions-detailed t)
+(setopt completions-format 'one-column)
+(setopt completions-group t)
+(setopt completion-auto-select 'second-tab) ; Much more eager
+;(setopt completion-auto-select t) ; See `C-h v completion-auto-select' for more possible values
(keymap-set minibuffer-mode-map "TAB" 'minibuffer-complete) ; TAB acts more like how it does in the shell
@@ -126,7 +126,7 @@ If the new path's directories does not exist, create them."
;(icomplete-vertical-mode)
;(fido-vertical-mode)
-;(setq icomplete-delay-completions-threshold 4000)
+;(setopt icomplete-delay-completions-threshold 4000)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
@@ -135,23 +135,23 @@ If the new path's directories does not exist, create them."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Mode line information
-(setq line-number-mode t) ; Show current line in modeline
-(setq column-number-mode t) ; Show column as well
+(setopt line-number-mode t) ; Show current line in modeline
+(setopt column-number-mode t) ; Show column as well
-(setq x-underline-at-descent-line nil) ; Prettier underlines
-(setq switch-to-buffer-obey-display-actions t) ; Make switching buffers more consistent
+(setopt x-underline-at-descent-line nil) ; Prettier underlines
+(setopt switch-to-buffer-obey-display-actions t) ; Make switching buffers more consistent
-(setq-default show-trailing-whitespace nil) ; By default, don't underline trailing spaces
-(setq-default indicate-buffer-boundaries 'left) ; Show buffer top and bottom in the margin
+(setopt show-trailing-whitespace nil) ; By default, don't underline trailing spaces
+(setopt indicate-buffer-boundaries 'left) ; Show buffer top and bottom in the margin
;; Enable horizontal scrolling
-(setq mouse-wheel-tilt-scroll t)
-(setq mouse-wheel-flip-direction t)
+(setopt mouse-wheel-tilt-scroll t)
+(setopt mouse-wheel-flip-direction t)
;; We won't set these, but they're good to know about
;;
-;; (setq-default indent-tabs-mode nil)
-;; (setq-default tab-width 4)
+;; (setopt indent-tabs-mode nil)
+;; (setopt tab-width 4)
;; Misc. UI tweaks
(blink-cursor-mode -1) ; Steady cursor
@@ -162,7 +162,7 @@ If the new path's directories does not exist, create them."
;; Display line numbers in programming mode
(add-hook 'prog-mode-hook 'display-line-numbers-mode)
-(setq-default display-line-numbers-width 3) ; Set a minimum width
+(setopt display-line-numbers-width 3) ; Set a minimum width
;; Nice line wrapping when working with text
(add-hook 'text-mode-hook 'visual-line-mode)
@@ -178,13 +178,13 @@ If the new path's directories does not exist, create them."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Show the tab-bar as soon as tab-bar functions are invoked
-(setq tab-bar-show 0)
+(setopt tab-bar-show 1)
;; Add the time to the tab-bar, if visible
(add-to-list 'tab-bar-format 'tab-bar-format-align-right 'append)
(add-to-list 'tab-bar-format 'tab-bar-format-global 'append)
-(setq display-time-format "%a %F %T")
-(setq display-time-interval 1)
+(setopt display-time-format "%a %F %T")
+(setopt display-time-interval 1)
(display-time-mode)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--
cgit v1.2.3