From 5664f0a67d17f9e5717ded6afbda70b36ea8c9f3 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Wed, 23 Jan 2019 17:12:40 +0100
Subject: merge-pr.sh: fix #9387: quick_conf doesn't work in emacs shell buffer

---
 dev/tools/merge-pr.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dev')

diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh
index a27dacc5a7..3a2214252b 100755
--- a/dev/tools/merge-pr.sh
+++ b/dev/tools/merge-pr.sh
@@ -12,7 +12,8 @@ OFFICIAL_REMOTE_HTTPS_URL="github.com/coq/coq"
 
 # Set SLOW_CONF to have the confirmation output wait for a newline
 # E.g. call $ SLOW_CONF= dev/tools/merge-pr.sh /PR number/
-if [ -z ${SLOW_CONF+x} ]; then
+# emacs doesn't send characters until the RET so we can't quick_conf
+if [ -z ${SLOW_CONF+x} ] || [ -n "$INSIDE_EMACS" ]; then
     QUICK_CONF="-n 1"
 else
     QUICK_CONF=""
-- 
cgit v1.2.3