# HG changeset patch
# User paulson
# Date 1530542602 -3600
# Node ID aa48b37092dffa6bc2d2e13ff3ee512309f1d10f
# Parent  cf01d04e94d71e6cda86a7740377ad903f86706b# Parent  c64319959babb06f821d121bb1535da0b9c1869b
merged

diff -r c64319959bab -r aa48b37092df ANNOUNCE
--- a/ANNOUNCE	Mon Jul 02 14:41:35 2018 +0100
+++ b/ANNOUNCE	Mon Jul 02 15:43:22 2018 +0100
@@ -4,7 +4,7 @@
 Isabelle2018 is now available.
 
 This version introduces many changes over Isabelle2017: see the NEWS
-file for further details. Here are the main points:
+file for further details. Here are some notable points:
 
 * Improved infix notation within terms.
 
diff -r c64319959bab -r aa48b37092df NEWS
--- a/NEWS	Mon Jul 02 14:41:35 2018 +0100
+++ b/NEWS	Mon Jul 02 15:43:22 2018 +0100
@@ -231,6 +231,9 @@
 
 *** HOL ***
 
+* Sledgehammer: bundled version of "vampire" (for non-commercial users)
+helps to avoid fragility of "remote_vampire" service.
+
 * Clarified relationship of characters, strings and code generation:
 
   - Type "char" is now a proper datatype of 8-bit values.
diff -r c64319959bab -r aa48b37092df src/Pure/General/mercurial.scala
--- a/src/Pure/General/mercurial.scala	Mon Jul 02 14:41:35 2018 +0100
+++ b/src/Pure/General/mercurial.scala	Mon Jul 02 15:43:22 2018 +0100
@@ -88,7 +88,7 @@
       repository: Boolean = true): Process_Result =
     {
       val cmdline =
-        "\"${HG:-hg}\" --config " + Bash.string("defaults." + name + "=") +
+        "export HGPLAIN=\n\"${HG:-hg}\" --config " + Bash.string("defaults." + name + "=") +
           (if (repository) " --repository " + ssh.bash_path(root) else "") +
           " --noninteractive " + name + " " + options + " " + args
       ssh.execute(cmdline)