From 70dfbc54d9a6b559dbfcfd6105a7e8c80d78d888 Mon Sep 17 00:00:00 2001
From: Clément Pit--Claudel <clement.pitclaudel@live.com>
Date: Sun, 26 Feb 2017 00:28:18 -0500
Subject: Fix incorrect assumption that noninteractive == byte-compiling

The PG Makefile does ensure (using --batch) that noninteractive is non-nil while
compiling, but package.el doesn't.
---
 generic/pg-user.el        | 4 ++--
 generic/proof-splash.el   | 2 +-
 generic/proof-useropts.el | 1 +
 generic/proof.el          | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'generic')

diff --git a/generic/pg-user.el b/generic/pg-user.el
index 513b477b..effe1eb5 100644
--- a/generic/pg-user.el
+++ b/generic/pg-user.el
@@ -563,9 +563,9 @@ last use time, to discourage saving these into the users database."
 ;; NB: completion table is expected to be set when proof-script
 ;; is loaded!  Call `proof-script-add-completions' to update.
 
-(unless noninteractive ; during compilation
+(unless (bound-and-true-p byte-compile-current-file)
   (eval-after-load "completion"
-  '(proof-add-completions)))
+    '(proof-add-completions)))
 
 (defun proof-script-complete (&optional arg)
   "Like `complete' but case-fold-search set to proof-case-fold-search."
diff --git a/generic/proof-splash.el b/generic/proof-splash.el
index 25db0946..7e7b8d54 100644
--- a/generic/proof-splash.el
+++ b/generic/proof-splash.el
@@ -264,7 +264,7 @@ binding to remove this buffer."
 (defun proof-splash-message ()
   "Make sure the user gets welcomed one way or another."
   (interactive)
-  (unless (or proof-splash-seen noninteractive)
+  (unless (or proof-splash-seen noninteractive (bound-and-true-p byte-compile-current-file))
     (if proof-splash-enable
 	(progn
 	  ;; disable ordinary emacs splash
diff --git a/generic/proof-useropts.el b/generic/proof-useropts.el
index b2cbb97a..eb9942a7 100644
--- a/generic/proof-useropts.el
+++ b/generic/proof-useropts.el
@@ -43,6 +43,7 @@ approximation we test whether proof-config is fully-loaded yet."
   (set-default sym value)
   (when (and
 	 (not noninteractive)
+	 (not (bound-and-true-p byte-compile-current-file))
 	 (featurep 'pg-custom)
 	 (featurep 'proof-config))
       (if (fboundp sym)
diff --git a/generic/proof.el b/generic/proof.el
index 1acfae71..4e7ddbea 100644
--- a/generic/proof.el
+++ b/generic/proof.el
@@ -26,7 +26,7 @@
 
 (require 'proof-site)			; site/prover config, global vars, autoloads
 
-(unless noninteractive
+(unless (or noninteractive (bound-and-true-p byte-compile-current-file))
   (proof-splash-message))		; welcome the user now.
 
 (require 'proof-compat)			; Emacs and OS compatibility
-- 
cgit v1.2.3