diff options
| author | Gaëtan Gilbert | 2019-01-23 17:12:40 +0100 |
|---|---|---|
| committer | Gaëtan Gilbert | 2019-01-23 17:12:40 +0100 |
| commit | 5664f0a67d17f9e5717ded6afbda70b36ea8c9f3 (patch) | |
| tree | 09ef85fbe3edb9f798a81481dd8a7767e3b3b013 /dev | |
| parent | 03c17218eeacb098ff57ecee1d98f46b7c8fa185 (diff) | |
merge-pr.sh: fix #9387: quick_conf doesn't work in emacs shell buffer
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/tools/merge-pr.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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="" |