Back to using transient-mark-mode

Turn delete-selection-mode back on, use region-sensitive commands again.  Fix
re/comment-dwim to correctly use arg for comment-line.

diff --git a/init.el b/init.el
index e166085ad25971ad6c8a41cb0816a72335b05884..fa75aeb0b979dc32b1de77d52934abf263a522f0 100644 (file)
--- a/init.el
+++ b/init.el
@@ -51,6 +51,7 @@
 (blink-cursor-mode -1)
 (column-number-mode t)
 (size-indication-mode t)
+(delete-selection-mode t)
 
 (setq delete-by-moving-to-trash t
       delete-pair-blink-delay 0
@@ -136,40 +137,6 @@
                            (?\{ . ?\})
                            (?\< . ?\>)))
 \f
-;; Transient mark mode temp enabling
-;; (setq transient-mark-mode nil)
-
-;; (defun re/remap-mark-command (command &optional map)
-;;   "Remap a mark-* command to temporarily activate Transient Mark mode.
-;; Taken from https://spwhitton.name/blog/entry/transient-mark-mode/"
-;;   (let* ((cmd (symbol-name command))
-;;      (fun (intern (concat "re/" cmd)))
-;;      (doc (concat "Call `"
-;;                   cmd
-;;                   "' and temporarily activate Transient Mark mode.")))
-;;     (fset fun `(lambda ()
-;;              ,doc
-;;              (interactive)
-;;              (call-interactively #',command)
-;;              (activate-mark)))
-;;     (if map
-;;     (define-key map (vector 'remap command) fun)
-;;       (global-set-key (vector 'remap command) fun))))
-
-;; (dolist (command '(mark-beginning-of-buffer
-;;                mark-end-of-buffer
-;;                mark-end-of-sentence
-;;                mark-page
-;;                mark-paragraph
-;;                mark-sexp
-;;                mark-defun
-;;                mark-whole-buffer
-;;                mark-word
-;;                rectangle-mark-mode
-;;                org-mark-element
-;;                org-mark-subtree))
-;;   (re/remap-mark-command command))
-\f
 ;; Help
 (setq apropos-do-all t)
 \f

diff --git a/re/re-bindings.el b/re/re-bindings.el
index fce52dcafcc27b2093c2dab4fb6f96011ba75aa7..be1c092df7d4530e28169e4d52da2006625e6572 100644 (file)
--- a/re/re-bindings.el
+++ b/re/re-bindings.el
@@ -12,8 +12,7 @@
 (keymap-global-set "<insert>" nil) ; I keep toggliŋ overwrite-mode haply
 (keymap-global-set "C-\\" #'undo-redo)
 (keymap-global-set "C-S-K" #'kill-whole-line)
-(keymap-global-set "C-w" #'backward-kill-word)
-(keymap-global-set "C-S-W" #'kill-region)
+(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-M-S-K" #'re/kill-defun)
 (keymap-global-set "C-S-U" #'universal-argument) ; C-u used above
@@ -24,8 +23,7 @@
 (keymap-global-set "M-j" (lambda () (interactive) (join-line 0))) ; join-line other way
 (keymap-global-set "C-z" #'zap-up-to-char)
 (keymap-global-set "C-c s" #'sort-lines)
-(keymap-global-set "M-;" #'comment-or-uncomment-region)
-(keymap-global-set "C-;" #'comment-line)
+(keymap-global-set "M-;" #'re/comment-dwim)
 (keymap-global-set "C-M-;" #'re/comment-defun)
 (keymap-global-set "<remap> <capitalize-word>" #'capitalize-dwim) ; M-c
 (keymap-global-set "<remap> <downcase-word>" #'downcase-dwim) ; M-l

diff --git a/re/re-editing-defuns.el b/re/re-editing-defuns.el
index b0a3f896a366bf78b8835a0bb9bf3e2854860739..e17665cd63f22cd205f420600b5f6a2d65524b16 100644 (file)
--- a/re/re-editing-defuns.el
+++ b/re/re-editing-defuns.el
@@ -34,13 +34,13 @@
                                  (region-beginning)
                                  (region-end))))
 
-(defun re/comment-dwim ()
+(defun re/comment-dwim (&optional arg)
   "Comment region if active, otherwise comment line.
 Stolen from https://depp.brause.cc/dotemacs"
-  (interactive)
+  (interactive "P")
   (if (use-region-p)
       (comment-or-uncomment-region (region-beginning) (region-end))
-    (comment-line)))
+    (comment-line arg)))
 
 (defun re/comment-defun (&optional arg)
   "Mark a defun and comment it out.