From 10d9ca87e9c51a475ebede48eea19ef0a9600950 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 15 May 2020 22:58:00 -0400 Subject: [PATCH] Correct regexps for recommended straight options When you're being prompted, these regexps control what option is highlighted as the recommended option, and two of them were definitely wrong, and another two *might've* been wrong. --- core/core-cli.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/core-cli.el b/core/core-cli.el index 1bd95c361..c53207d2a 100644 --- a/core/core-cli.el +++ b/core/core-cli.el @@ -223,13 +223,13 @@ BODY will be run when this dispatcher is called." ;;; Straight hacks (defvar doom--cli-straight-discard-options - '((" has diverged from branch " + '(("has diverged from" . "^Reset [^ ]+ to branch") - (" but recipe specifies a URL of " - . "^Delete remote \"[^\"]+\", re-create it with correct ") - (" has a merge conflict:" + ("but recipe specifies a URL of" + . "re-create it with correct URL") + ("has a merge conflict:" . "^Abort merge$") - (" has a dirty worktree:" + ("has a dirty worktree:" . "^Discard changes$") ("^In repository " . "^Reset branch \\|^Delete remote [^,]+, re-create it with correct URL"))