emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(cli): --force: handle more straight prompts

Browse source 
Fix: #7906
This commit is contained in:
Henrik Lissner 2024-07-27 17:38:59 -04:00
parent ff3fd15b02
commit b163c21fe5
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/cli/packages.el
View file

@ -688,7 +688,7 @@ If ELPA-P, include packages installed with package.el (M-x package-install)."
("^In repository \"[^\"]+\", [^ ]+ (on branch \"[^\"]+\") is ahead of default branch \"[^\"]+\"" ("^In repository \"[^\"]+\", [^ ]+ (on branch \"[^\"]+\") is ahead of default branch \"[^\"]+\""
. "^Checkout branch \"") . "^Checkout branch \"")
("^In repository " ("^In repository "
. "^Reset branch \\|^Delete remote [^,]+, re-create it with correct URL\\|^Checkout \"main\"")) . "^Reset branch \\|^Delete remote [^,]+, re-create it with correct URL\\|^Checkout \""))
"A list of regexps, mapped to regexps. "A list of regexps, mapped to regexps.
Their CAR is tested against the prompt, and CDR is tested against the presented Their CAR is tested against the prompt, and CDR is tested against the presented
@ -736,10 +736,12 @@ original state.")
;; We can't intercept C-g, so no point displaying any options for this key ;; We can't intercept C-g, so no point displaying any options for this key
;; when C-c is the proper way to abort batch Emacs. ;; when C-c is the proper way to abort batch Emacs.
(delq! "C-g" actions 'assoc) (delq! "C-g" actions 'assoc)
;; HACK: These are associated with opening dired or magit, which isn't ;; HACK: Remove actions that don't work in noninteractive Emacs (like
;; possible in tty Emacs, so... ;; opening dired or magit).
(delq! "e" actions 'assoc) (setq actions
(delq! "g" actions 'assoc) (cl-remove-if (lambda (o)
(string-match-p "^\\(?:Magit\\|Dired\\)" (nth 1 o)))
actions))
(if (doom-cli-context-suppress-prompts-p doom-cli--context) (if (doom-cli-context-suppress-prompts-p doom-cli--context)
(cl-loop for (_key desc func) in actions (cl-loop for (_key desc func) in actions
when desc when desc