branch: master
commit 9b44fcb22434d0e9535275da471c1269d1c7688c
Author: Lars Ingebrigtsen <la...@gnus.org>
Commit: Lars Ingebrigtsen <la...@gnus.org>
Don't insert two Summary lines in the commit message
---
packages/debbugs/debbugs-gnu.el | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/packages/debbugs/debbugs-gnu.el b/packages/debbugs/debbugs-gnu.el
index 7913e96..5dea0d3 100644
--- a/packages/debbugs/debbugs-gnu.el
+++ b/packages/debbugs/debbugs-gnu.el
@@ -2340,8 +2340,7 @@ If SELECTIVELY, query the user before applying the patch."
(let ((add-log-full-name (car from))
(add-log-mailing-address (cadr from)))
(add-change-log-entry-other-window)
- (when patch-subject
- (setq-local debbugs-gnu-patch-subject patch-subject))
+ (setq-local debbugs-gnu-patch-subject patch-subject)
(when changelog
(delete-region (line-beginning-position) (point-max))
(save-restriction
@@ -2433,9 +2432,14 @@ If SELECTIVELY, query the user before applying the
patch."
(switch-to-buffer "*vc-diff*")
(other-window 1)
(when patch-subject
- (insert "Summary: "
- (replace-regexp-in-string "^ *\\[PATCH\\] *" "" patch-subject)
- "\n"))))
+ (goto-char (point-min))
+ (unless (re-search-forward "^Summary: ")
+ (insert "Summary: \n")
+ (forward-line -1)
+ (end-of-line))
+ (insert (replace-regexp-in-string "^ *\\[PATCH\\] *" "" patch-subject))
+ (beginning-of-line)
+ (search-forward ": " nil t))))
(defun debbugs-gnu-save-cache ()
"Save the bugs cache to a file."
