[elpa] externals/debbugs 7687d6b 017/311: (debbugs-emacs): Display multiple merges prettier.

[Stefan Monnier]

branch: externals/debbugs
commit 7687d6bb36f067aba7b1624717a3a42ed809b104
Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
Commit: Lars Magne Ingebrigtsen <larsi@gnus.org>

    (debbugs-emacs): Display multiple merges prettier.
---
 ChangeLog      |  1 +
 debbugs-gnu.el | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d1bcd54..1de33e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        (debbugs-send-control-message): Record the bug number on group
        entry, so that we don't have to rely on subject header mangling,
        which is fragile.
+       (debbugs-emacs): Display multiple merges prettier.
 
 2011-07-02  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index 634201f..44797d5 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -91,7 +91,8 @@
                        (decode-coding-string (cdr (assq 'originator status))
                                              'utf-8)))
              (subject (decode-coding-string (cdr (assq 'subject status))
-                                            'utf-8)))
+                                            'utf-8))
+             merged)
          (setq address
                ;; Prefer the name over the address.
                (or (cdr address)
@@ -108,8 +109,12 @@
                     (unless (equal (cdr (assq 'pending status)) "pending")
                       (setq words
                             (concat words "," (cdr (assq 'pending status)))))
-                    (when (cdr (assq 'mergedwith status))
-                      (setq words (format "%s,%s" (cdr (assq 'mergedwith 
status))
+                    (when (setq merged (cdr (assq 'mergedwith status)))
+                      (setq words (format "%s,%s"
+                                          (if (numberp merged)
+                                              merged
+                                            (mapconcat 'number-to-string merged
+                                                       ","))
                                           words)))
                     (if (> (length words) 20)
                         (propertize (substring words 0 20) 'help-echo words)