From: rush <rearman@r717.net>
Date: Tue, 8 Sep 2026 13:04:30 +0000 (-0400)
Subject: Change options related to emacs version 31.1
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=1e34f13b61601df4d96b523d4de7a0b82b8a68bb;p=emacsinit.git

Change options related to emacs version 31.1

Now can set kill region to do 'emacs-word' or 'unix-word' when region is not
active.  I was doing the same with my own function.  Similar story for
interactive clone for vc-mode.
---

diff --git a/early-init.el b/early-init.el
index 31a8c67..f5844e4 100644
--- a/early-init.el
+++ b/early-init.el
@@ -32,5 +32,7 @@
       default-directory "~/"
       initial-scratch-message ";;; SCRATCH\n\n")
 
+(set-default-toplevel-value 'lexical-binding t)
+
 (provide 'early-init)
 ;;; early-init.el ends here
diff --git a/init.el b/init.el
index dac0a0c..8286657 100644
--- a/init.el
+++ b/init.el
@@ -181,14 +181,15 @@
 (with-eval-after-load 'org
   (require 'org-mouse)
   (add-to-list 'org-export-backends 'md)
+  (keymap-set org-mode-map "C-c t" #'org-transclusion-mode)
+  ; sexp-like navigation
   (keymap-set org-mode-map "C-M-h" #'org-mark-subtree)
   (keymap-set org-mode-map "C-M-u" #'org-up-element)
   (keymap-set org-mode-map "C-M-d" #'org-down-element)
   (keymap-set org-mode-map "C-M-b" #'org-backward-heading-same-level)
   (keymap-set org-mode-map "C-M-f" #'org-forward-heading-same-level)
   (keymap-set org-mode-map "C-M-p" #'org-previous-visible-heading)
-  (keymap-set org-mode-map "C-M-n" #'org-next-visible-heading)
-  (keymap-set org-mode-map "C-c t" #'org-transclusion-mode))
+  (keymap-set org-mode-map "C-M-n" #'org-next-visible-heading))
 
 (keymap-global-set "C-c l" #'org-store-link)
 (keymap-global-set "C-c a" #'org-agenda)
@@ -399,14 +400,8 @@ installed."
 
 (keymap-global-set "M-o" #'re/open-line-above)
 
-(defun re/kill-bword-or-region (&optional arg)
-  "Kill region if active, otherwise kill back one word."
-  (interactive "p")
-  (if (use-region-p)
-      (kill-region (region-beginning) (region-end))
-    (backward-kill-word arg)))
+(setq kill-region-dwim 'emacs-word) ; kill word with C-w when region not active
 
-(keymap-global-set "C-w" #'re/kill-bword-or-region)
 (keymap-global-set "C-u" (lambda () (interactive) (kill-line 0))) ; kill-line backwards
 (keymap-global-set "C-S-U" #'universal-argument)
 (keymap-set key-translation-map "C-h" "<DEL>") ; Rather F1 for help, also C-S-H works
@@ -666,7 +661,7 @@ If in org-mode, call `org-end-of-line' first."
 
 ;;; Recent Files/Buffers
 
-(midnight-mode t)
+(midnight-mode 1)
 (setq clean-buffer-list-delay-general 1)
 (dolist (never-re '("\\` \\*tramp/.*\\'"
 		    "\\` \\*eshell.*\\'"))
@@ -1130,15 +1125,15 @@ Stolen from emacsredux.com."
 
 ;;; Version-control mode
 
-(defun re/vc-clone ()
-  "Interactively clone with vc-mode.
-Prompt for url and local dir."
-  (interactive)
-  (let* ((url (read-string "Repository URL: "))
-	 (dir (read-string "Local Dir: " (file-name-base url))))
-    (vc-git-clone url dir nil)))
+;; (defun re/vc-clone ()
+;;   "Interactively clone with vc-mode.
+;; Prompt for url and local dir."
+;;   (interactive)
+;;   (let* ((url (read-string "Repository URL: "))
+;;	 (dir (read-string "Local Dir: " (file-name-base url))))
+;;     (vc-git-clone url dir nil)))
 
-(keymap-global-set "C-x v C" #'re/vc-clone)
+;; (keymap-global-set "C-x v C" #'re/vc-clone)
 
 (defun re/vc-show-branches (&optional arg)
   "Display all Git branches in a separate buffer.
@@ -1191,7 +1186,9 @@ With arg, ask for remote, otherwise fetch all."
       vc-handled-backends '(jj Git)
       vc-git-log-switches '("--oneline" "--graph" "--decorate" "--all")
       vc-git-log-edit-summary-target-len 50
-      vc-find-revision-no-save t)
+      vc-find-revision-no-save t
+      vc-allow-rewriting-published-history t
+      vc-use-incoming-outgoing-prefixes t)
 
 ;;; Backups