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 <kha@treskal.com>

diff --git a/contrib/stgit.el b/contrib/stgit.el
index ba6df6ab65a2364d5a80d6a707706ec1f45e4b00..339ef13eb950de0cffc0e734cfea7ddaee514a28 100644 (file)
--- 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))
         (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
                (let ((state (match-string 1))
                      (patchsym (intern (match-string 3))))
                  (put-text-property