2 files changed, 23 insertions, 1 deletions

@@ -29,7 +29,12 @@ any directory proferred by `consult-dir'."
   "Delete the character to the right, or quit eshell on an empty line."
   (interactive "p")
   (if (and (eolp) (looking-back eshell-prompt-regexp))
-      (eshell-life-is-too-much)
+      (progn (eshell-life-is-too-much)
+             (when (and (<= 1 (count-windows))
+                        ;; I'm guessing the extra frame is for the server?
+                        (> (length (frame-list)) 2)
+                        server-process)
+               (delete-frame)))
     (delete-forward-char arg)))
 
 ;;; Insert previous arguments
@@ -94,5 +94,22 @@ replace itself with the RECIPE's package."
   :indent 1
   :shorthand #'+setup-straight-shorthand)
 
+
+;;; Redefines of `setup' forms
+
+(setup-define :bind-into
+  (lambda (feature-or-map &rest rest)
+    (cl-loop for f/m in (ensure-list feature-or-map)
+             collect (if (string-match-p "-map\\'" (symbol-name f/m))
+                         `(:with-map ,f/m (:bind ,@rest))
+                       `(:with-feature ,f/m (:bind ,@rest)))
+             into forms
+             finally return `(progn ,@forms)))
+  :documentation "Bind into keys into the map(s) of FEATURE-OR-MAP.
+FEATURE-OR-MAP can be a feature or map name or a list of them.
+The arguments REST are handled as by `:bind'."
+  :debug '(sexp &rest form sexp)
+  :indent 1)
+
 (provide '+setup)
 ;;; +setup.el ends here