awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases 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
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-cli.el
View File

@ -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"))