From: Karl Hasselström Date: Mon, 14 Apr 2008 23:18:53 +0000 (+0200) Subject: emacs mode: handle "stg status" output with # X-Git-Tag: v0.15-rc1~248 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/8ee1e4b4d295c6ec8c67ec40f6f9bc493ff7bf8c emacs mode: handle "stg status" output with # Recently, "stg status" started separating patch names and descriptions with # rather than |. This broke some parts of the emacs mode, such as coloring and patch selection. This patch makes the emacs mode accept either delimiter. Signed-off-by: Karl Hasselström --- diff --git a/contrib/stgit.el b/contrib/stgit.el index ba6df6a..339ef13 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -107,7 +107,7 @@ (defun stgit-rescan () (cond ((looking-at "Branch: \\(.*\\)") (put-text-property (match-beginning 1) (match-end 1) 'face 'bold)) - ((looking-at "\\([>+-]\\)\\( \\)\\([^ ]+\\) *| \\(.*\\)") + ((looking-at "\\([>+-]\\)\\( \\)\\([^ ]+\\) *[|#] \\(.*\\)") (let ((state (match-string 1)) (patchsym (intern (match-string 3)))) (put-text-property