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

Correct regexps for recommended straight options

Browse source 
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.
This commit is contained in:
Henrik Lissner 2020-05-15 22:58:00 -04:00
parent eafad7bbad
commit 10d9ca87e9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/core-cli.el
View file

@ -223,10 +223,10 @@ BODY will be run when this dispatcher is called."
;;; Straight hacks ;;; Straight hacks
(defvar doom--cli-straight-discard-options (defvar doom--cli-straight-discard-options
'((" has diverged from branch " '(("has diverged from"
. "^Reset [^ ]+ to branch") . "^Reset [^ ]+ to branch")
("but recipe specifies a URL of" ("but recipe specifies a URL of"
. "^Delete remote \"[^\"]+\", re-create it with correct ") . "re-create it with correct URL")
("has a merge conflict:" ("has a merge conflict:"
. "^Abort merge$") . "^Abort merge$")
("has a dirty worktree:" ("has a dirty worktree:"