Emacs mode: show patches' short description

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: David Kågedal <davidk@lysator.liu.se>

diff --git a/contrib/stgit.el b/contrib/stgit.el
index 78e9520f2d601ee9b96dafd9e060a210251e8c40..ed2fc376131742f22bf25949a7aed9e223e0c27a 100644 (file)
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -62,7 +62,7 @@ (defun stgit-refresh ()
     (erase-buffer)
     (insert "Branch: ")
     (stgit-run "branch")
     (erase-buffer)
     (insert "Branch: ")
     (stgit-run "branch")

-    (stgit-run "series")
+    (stgit-run "series" "--description")

     (if curpatch
         (stgit-goto-patch curpatch)
       (goto-line curline))))
     (if curpatch
         (stgit-goto-patch curpatch)
       (goto-line curline))))


@@ -97,13 +97,14 @@ (defun stgit-mode ()
         goal-column 2)
   (use-local-map stgit-mode-map)
   (set (make-local-variable 'list-buffers-directory) default-directory)
         goal-column 2)
   (use-local-map stgit-mode-map)
   (set (make-local-variable 'list-buffers-directory) default-directory)

+  (set-variable 'truncate-lines 't)

   (run-hooks 'stgit-mode-hook))
 
 (defun stgit-patch-at-point ()
   "Return the patch name on the current line"
   (save-excursion
     (beginning-of-line)
   (run-hooks 'stgit-mode-hook))
 
 (defun stgit-patch-at-point ()
   "Return the patch name on the current line"
   (save-excursion
     (beginning-of-line)

-    (if (looking-at "[>+-] \\(.*\\)")
+    (if (looking-at "[>+-] \\([^ ]*\\)")

         (match-string 1)
       nil)))
 
         (match-string 1)
       nil)))
 


@@ -111,7 +112,7 @@ (defun stgit-goto-patch (patch)
   "Move point to the line containing PATCH"
   (let ((p (point)))
     (goto-char (point-min))
   "Move point to the line containing PATCH"
   (let ((p (point)))
     (goto-char (point-min))

-    (if (re-search-forward (concat "[>+-] " (regexp-quote patch) "$") nil t)
+    (if (re-search-forward (concat "[>+-] " (regexp-quote patch) " ") nil t)

         (progn (move-to-column goal-column)
                t)
       (goto-char p)
         (progn (move-to-column goal-column)
                t)
       (goto-char p)