[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/debbugs c8e3100 302/311: If there are multiple patches,
From: |
Stefan Monnier |
Subject: |
[elpa] externals/debbugs c8e3100 302/311: If there are multiple patches, collect the .rej from all of them |
Date: |
Sun, 29 Nov 2020 18:42:34 -0500 (EST) |
branch: externals/debbugs
commit c8e310060c2807d2404430f1547c99a4c1418fb3
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
If there are multiple patches, collect the .rej from all of them
---
debbugs-gnu.el | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index 4516423..f2179f7 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -2421,13 +2421,25 @@ If SELECTIVELY, query the user before applying the
patch."
(y-or-n-p (format "%s\nApply?"
(buffer-substring (point-min)
(min 200 (point-max))))))
- (call-process-region (point-min) (point-max)
- "patch" nil output-buffer nil
- "-r" rej "--no-backup-if-mismatch"
- "-l" "-f"
- "-d" (expand-file-name
- debbugs-gnu-current-directory)
- "-p1"))))
+ (let (old-rej)
+ (when (file-exists-p rej)
+ (with-temp-buffer
+ (insert-file-contents rej)
+ (setq old-rej (buffer-string)))
+ (delete-file rej))
+ (call-process-region (point-min) (point-max)
+ "patch" nil output-buffer nil
+ "-r" rej "--no-backup-if-mismatch"
+ "-l" "-f"
+ "-d" (expand-file-name
+ debbugs-gnu-current-directory)
+ "-p1")
+ (when old-rej
+ (with-temp-buffer
+ (insert old-rej)
+ (when (file-exists-p rej)
+ (insert-file-contents rej))
+ (write-region (point-min) (point-max) rej nil 'silent)))))))
(set-buffer output-buffer)
(when (file-exists-p rej)
(goto-char (point-max))
- [elpa] externals/debbugs 5909433 269/311: * debbugs-gnu.el (debbugs-gnu-search): Make arguments optional., (continued)
- [elpa] externals/debbugs 5909433 269/311: * debbugs-gnu.el (debbugs-gnu-search): Make arguments optional., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs a55b603 272/311: ; Further refinement in packages/debbugs/debbugs-ug.texi, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 8c373ce 281/311: Various minor wording changes, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 2efa3a7 284/311: Improve bug id guessing for multi-bug mailboxes, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 50d3dca 289/311: Make debbugs install a handler in browse-url-default-handlers., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 7b47938 294/311: Fix check for Summary, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 40fc893 295/311: Fix From addresses in debbugs-gnu, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 91ddba4 296/311: Fix typo in previous debbugs-gnu checkin, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 70e705c 306/311: Set the subject in debbugs-gnu correctly, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs bdf739e 303/311: Parse single-word names better, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs c8e3100 302/311: If there are multiple patches, collect the .rej from all of them,
Stefan Monnier <=
- [elpa] externals/debbugs 6d5364b 184/311: * debbugs: Use cl-lib. Use lexical-binding when available, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs ad0e666 190/311: * packages/debbugs/debbugs-ug.texi (Searching Bugs): Fix typo., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 5bd30ad 292/311: Release debbugs 0.24., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 19c8f96 304/311: * debbugs-gnu.el (debbugs-gnu--parse-mail): Pacify byte compiler., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs f41daeb 300/311: Release debbugs 0.26, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs 8fe8934 310/311: Really fix typo in previous debbugs-gnu change, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs c615e66 187/311: Bump version number, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs bcfcc95 135/311: * debbugs-gnu.el (top): Make byte compiler quiet., Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs e91cc0a 183/311: Increase the Debbugs version number, Stefan Monnier, 2020/11/29
- [elpa] externals/debbugs a447400 204/311: Document debbugs-gnu-send-mail-function, Stefan Monnier, 2020/11/29