Merge branch 'main' of tildegit.org:acdw/emacs

1 files changed, 22 insertions, 1 deletions

@@ -1135,7 +1135,28 @@ if ripgrep is installed, otherwise `consult-grep'."
            ))
 
 (setup (:straight expand-region)
-  (:global "C-=" er/expand-region))
+
+  (defun acdw/set-mark-or-expand-region (arg)
+    "Set mark at point and activate, jump to mark, or expand region.
+See `set-mark-command' and `expand-region'.
+
+With no prefix argument, either run `set-mark-command' on first
+invocation and `er/expand-region' on each successive invocation.
+
+With any prefix argument 
+(e.g., \\[universal-argument] \\[set-mark-command]), act as with
+`set-mark-command' (i.e., pop the mark).  Don't care about
+successive invocations."
+    (interactive "P")
+    (cond
+     (arg
+      (setq this-command 'set-mark-command)
+      (set-mark-command arg))
+     ((eq last-command 'acdw/set-mark-or-expand-region)
+      (er/expand-region 1))
+     (t (set-mark-command arg))))
+  
+  (:global "C-SPC" acdw/set-mark-or-expand-region))
 
 (setup (:straight fennel-mode)
   (:needs "fennel")