about summary refs log tree commit diff stats
path: root/.emacs.d/lisp/init-crux.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/lisp/init-crux.el')
-rw-r--r--.emacs.d/lisp/init-crux.el11
1 files changed, 1 insertions, 10 deletions
diff --git a/.emacs.d/lisp/init-crux.el b/.emacs.d/lisp/init-crux.el
index 0739bd3..5f7b836 100644
--- a/.emacs.d/lisp/init-crux.el
+++ b/.emacs.d/lisp/init-crux.el
@@ -6,16 +6,6 @@
   :defer 5
   :commands crux-start-or-switch-to
   :config
-  (defmacro crux-with-region-or-sexp-or-line (func)
-    "When called with no active region, call FUNC on current sexp."
-    `(defadvice ,func (before with-region-or-sexp-or-line activate compile)
-       (interactive
-        (cond
-         (mark-active (list (region-beginning) (region-end)))
-         ((in-string-p) (flatten-list (bounds-of-thing-at-point 'string)))
-         ((thing-at-point 'list) (flatten-list (bounds-of-thing-at-point 'list)))
-         (t (list (line-beginning-position) (line-beginning-position 2)))))))
-
   (crux-with-region-or-sexp-or-line sp-kill-region)
   (crux-with-region-or-buffer shell-command-on-region)
   (crux-with-region-or-buffer indent-region)
@@ -25,6 +15,7 @@
   ("C-^" . crux-top-join-line)
   ("C-<backspace>" . crux-kill-line-backwards)
   ([remap kill-whole-line] . crux-kill-whole-line)
+  ([remap keyboard-quit] . crux-keyboard-quit-dwim)
   ;; TODO don't need all of these
   ("C-<return>" . crux-smart-open-line)
   ("S-<return>" . crux-smart-open-line)