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 31a8c6765bb453bd48f34eedc50ec00f039846ca..f5844e4d1b8f18049d71f9a6c282e3e23e0930b1 100644 (file)
--- a/early-init.el
+++ b/early-init.el
@@ -32,5 +32,7 @@
       default-directory "~/"\r
       initial-scratch-message ";;; SCRATCH\n\n")\r
 \r
+(set-default-toplevel-value 'lexical-binding t)\r
+\r
 (provide 'early-init)\r
 ;;; early-init.el ends here\r

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