From ef8731a3c3ef74d52fe145b91a1ef28d92dbd3cd Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 19 Apr 2016 22:16:26 -0400 Subject: [PATCH] Remove narf-minibuffer-quit --- core/core-defuns.el | 10 ---------- core/core-evil.el | 2 +- private/my-bindings.el | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/core/core-defuns.el b/core/core-defuns.el index c0c2df061..1f15f7f0c 100644 --- a/core/core-defuns.el +++ b/core/core-defuns.el @@ -259,16 +259,6 @@ Examples: ;;;; Global Defuns ;;;;;;;;;;;;;;;;;;;;; -(defun narf-minibuffer-quit () - "Abort recursive edit. In Delete Selection mode, if the mark is -active, just deactivate it; then it takes a second \\[keyboard-quit] -to abort the minibuffer." - (interactive) - (let (message-log-max) - (if (and delete-selection-mode transient-mark-mode mark-active) - (setq deactivate-mark t) - (abort-recursive-edit)))) - (defun narf-reload () "Reload `load-path', in case you updated cask while emacs was open!" (interactive) diff --git a/core/core-evil.el b/core/core-evil.el index 954b05989..ead1b24a5 100644 --- a/core/core-evil.el +++ b/core/core-evil.el @@ -93,7 +93,7 @@ (defadvice evil-force-normal-state (after evil-esc-quit activate) "Close popups, disable search highlights and quit the minibuffer if open." (when (minibuffer-window-active-p (minibuffer-window)) - (narf-minibuffer-quit)) + (abort-recursive-edit)) (ignore-errors (evil-ex-nohighlight)) ;; Close non-repl popups and clean up `narf-popup-windows' diff --git a/private/my-bindings.el b/private/my-bindings.el index 4d4eb9973..2faeafdaa 100644 --- a/private/my-bindings.el +++ b/private/my-bindings.el @@ -403,7 +403,7 @@ minibuffer-local-completion-map minibuffer-local-must-match-map minibuffer-local-isearch-map) - [escape] 'narf-minibuffer-quit + [escape] 'abort-recursive-edit "C-r" 'evil-paste-from-register) (:map read-expression-map "C-w" 'backward-kill-word)