^W now makes sense

1 files changed, 13 insertions, 4 deletions

diff --git a/emacs/inits/70-global-keybinds.el b/emacs/inits/70-global-keybinds.el
index fc46811..816998f 100644
--- a/emacs/inits/70-global-keybinds.el
+++ b/emacs/inits/70-global-keybinds.el
@@ -1,8 +1,8 @@
-;; Time-stamp: <2020-05-03 20:35:38 (tslil@bison)>
+;; Time-stamp: <2020-10-26 17h12 EDT (hobbies)>
 
 (setq time-stamp-active t
       time-stamp-line-limit 3
-      time-stamp-format "%Y-%02m-%02d %02H:%02M:%02S (%u@%s)")
+      time-stamp-format "%Y-%02m-%02d %02Hh%02M %Z (%s)")
 
 (add-hook 'before-save-hook #'time-stamp)
 
@@ -22,8 +22,7 @@
     (time-stamp)))
 (global-set-key (kbd "C-x t") 'insert-timestamp)
 
-(global-set-key (kbd "<f11>") 'notmuch)
-(global-set-key (kbd "C-x m") 'eshell)
+(global-set-key (kbd "C-z") 'nil)
 
 (use-package eterm-256color
   :ensure t
@@ -37,4 +36,14 @@
 
 (global-set-key (kbd "C-v") 'delete-indentation)
 
+;; -----------------------------------------------------------------------------
+;; Killing
 (global-set-key (kbd "C-c C-k") 'kill-whole-line)
+(global-set-key (kbd "M-z") 'zap-up-to-char)
+
+(defun kill-region-or-backward-kill-word (arg)
+  (interactive "p")
+  (if (region-active-p) (kill-region 0 0 t)
+    (backward-kill-word arg)))
+
+(global-set-key (kbd "C-w") 'kill-region-or-backward-kill-word)