Remove narf-minibuffer-quit

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)

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'

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)