emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/debbugs e06d335153: Don't compile after patching, if co


From: Eric Abrahamsen
Subject: [elpa] externals/debbugs e06d335153: Don't compile after patching, if compile command is nil, 0.40
Date: Fri, 16 Feb 2024 00:49:44 -0500 (EST)

branch: externals/debbugs
commit e06d335153fab7eb82771919c82de125b51bdf66
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    Don't compile after patching, if compile command is nil, 0.40
    
    * debbugs-gnu.el (debbugs-gnu-apply-patch): Allow the user to set
    debbugs-gnu-compile-command to nil to skip the compile step.
    * debbugs-ug.texi (Applying Patches): Add to documentation.
    * debbugs.el: Release as 0.40
---
 debbugs-gnu.el  | 32 ++++++++++++++++++--------------
 debbugs-ug.texi |  6 ++++++
 debbugs.el      |  2 +-
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index a5453334cd..f952cdae14 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -276,8 +276,10 @@ If nil, the value of `send-mail-function' is used instead."
 
 (defcustom debbugs-gnu-compile-command "make -k"
   "Command to run to compile Emacs."
-  :type 'string
-  :version "28.1")
+  :type '(choice
+          (const :tag "Do not compile automatically" nil)
+          (string :tag "Compile command"))
+  :version "30.1")
 
 (defcustom debbugs-gnu-suppress-closed t
   "If non-nil, don't show closed bugs."
@@ -1572,7 +1574,7 @@ interesting to you."
                     (debbugs-gnu-current-status)))
   (switch-to-buffer "*Bug Status*")
   (let ((inhibit-read-only t)
-        (pp-default-function 'pp-29))
+        (pp-default-function #'pp-29))
     (erase-buffer)
     (when query
       (insert ";; Query\n")
@@ -2612,12 +2614,13 @@ If SELECTIVELY, query the user before applying the 
patch."
       (insert-file-contents-literally rej))
     (goto-char (point-max))
     (save-some-buffers t)
-    (require 'compile)
-    (mapc #'kill-process compilation-in-progress)
-    (compile
-     (format "cd %s; %s"
-            debbugs-gnu-current-directory
-            debbugs-gnu-compile-command))
+    (when debbugs-gnu-compile-command
+      (require 'compile)
+      (mapc #'kill-process compilation-in-progress)
+      (compile
+       (format "cd %s; %s"
+              debbugs-gnu-current-directory
+              debbugs-gnu-compile-command)))
     (let (buf)
       (if (debbugs-gnu-apply-patch-prefers-magit)
           (progn
@@ -2637,11 +2640,12 @@ If SELECTIVELY, query the user before applying the 
patch."
       (delete-other-windows)
       (switch-to-buffer output-buffer)
       (split-window)
-      (split-window)
-      (other-window 1)
-      (switch-to-buffer "*compilation*")
-      (goto-char (point-max))
-      (other-window 1)
+      (when debbugs-gnu-compile-command
+       (split-window)
+       (other-window 1)
+       (switch-to-buffer "*compilation*")
+       (goto-char (point-max))
+       (other-window 1))
       (switch-to-buffer buf)
       (goto-char (point-min)))))
 
diff --git a/debbugs-ug.texi b/debbugs-ug.texi
index d5663121d1..b949d750b6 100644
--- a/debbugs-ug.texi
+++ b/debbugs-ug.texi
@@ -789,6 +789,11 @@ included in the message, applies them, runs @command{make 
-k} in the
 @file{lisp} subdirectory, and shows a @samp{*vc-dir*} buffer of the
 Emacs repository with the changed file(s).
 
+@vindex debbugs-gnu-compile-command
+The exact make command used is controlled by the user option
+@code{debbugs-gnu-compile-command}.  This option can also be set to
+@code{nil} to skip the compilation step.
+
 @vindex debbugs-gnu-trunk-directory
 @vindex debbugs-gnu-branch-directory
 The Emacs repository is determined via the user options
@@ -804,6 +809,7 @@ creates a ChangeLog entry with all needed information.  A 
final
 @kbd{M-m} in the @samp{ChangeLog} buffer commits the patch via
 @samp{*vc-log*}.
 
+@vindex debbugs-gnu-apply-patch-prefers-magit
   If the user option @code{debbugs-gnu-apply-patch-prefers-magit} is
 non-@code{nil}, the third-party package Magit will be used instead of
 VC when you hit @kbd{M-m} in the GNUS ephemeral group.  Note that the
diff --git a/debbugs.el b/debbugs.el
index 419ca305a4..d359aa0a23 100644
--- a/debbugs.el
+++ b/debbugs.el
@@ -5,7 +5,7 @@
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, hypermedia
 ;; Package: debbugs
-;; Version: 0.39
+;; Version: 0.40
 ;; Package-Requires: ((emacs "26.1") (soap-client "3.1.5"))
 
 ;; This file is not part of GNU Emacs.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]