chiark / gitweb /
emacs mode: handle "stg status" output with #
authorKarl Hasselström <kha@treskal.com>
Mon, 14 Apr 2008 23:18:53 +0000 (01:18 +0200)
committerKarl Hasselström <kha@treskal.com>
Tue, 15 Apr 2008 20:00:29 +0000 (22:00 +0200)
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>
contrib/stgit.el

index ba6df6ab65a2364d5a80d6a707706ec1f45e4b00..339ef13eb950de0cffc0e734cfea7ddaee514a28 100644 (file)
@@ -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