# HG changeset patch
# User wenzelm
# Date 1335301439 -7200
# Node ID 3531a8edcd4893aa199df2bd75cf884121772e2a
# Parent  63c939dcd0555497aaad632c81c82139246509ec# Parent  5c158c6fe98c5ad31bd6c0df1a5546c71e5bed7b
merged

diff -r 63c939dcd055 -r 3531a8edcd48 Admin/Cygwin/Cygwin-Terminal.bat
--- a/Admin/Cygwin/Cygwin-Terminal.bat	Tue Apr 24 20:55:09 2012 +0200
+++ b/Admin/Cygwin/Cygwin-Terminal.bat	Tue Apr 24 23:03:59 2012 +0200
@@ -3,4 +3,7 @@
 set HOME=%HOMEDRIVE%%HOMEPATH%
 set PATH=%CD%\bin;%PATH%
 set CHERE_INVOKING=true
+
+echo This is the GNU Bash interpreter of Cygwin.
+echo Use command "isabelle" to invoke Isabelle tools.
 "%CD%\contrib\cygwin-1.7.9\bin\bash" --login -i
diff -r 63c939dcd055 -r 3531a8edcd48 etc/settings
--- a/etc/settings	Tue Apr 24 20:55:09 2012 +0200
+++ b/etc/settings	Tue Apr 24 23:03:59 2012 +0200
@@ -144,11 +144,9 @@
     PDF_VIEWER="open -W -n"
     ;;
   *)
-    PDF_VIEWER=xpdf
+    PDF_VIEWER=evince
     ;;
 esac
-#PDF_VIEWER=acroread
-#PDF_VIEWER=evince
 
 
 # Printer spool command for PS files
diff -r 63c939dcd055 -r 3531a8edcd48 src/HOL/Boogie/Examples/VCC_Max.thy
diff -r 63c939dcd055 -r 3531a8edcd48 src/Pure/System/isabelle_system.scala
--- a/src/Pure/System/isabelle_system.scala	Tue Apr 24 20:55:09 2012 +0200
+++ b/src/Pure/System/isabelle_system.scala	Tue Apr 24 23:03:59 2012 +0200
@@ -50,9 +50,14 @@
       val standard_system = new Standard_System
       val settings =
       {
-        val env = Map(System.getenv.toList: _*) +
+        val env0 = Map(System.getenv.toList: _*) +
           ("ISABELLE_JDK_HOME" -> standard_system.this_jdk_home())
 
+        val user_home = System.getProperty("user.home")
+        val env =
+          if (user_home == null || env0.isDefinedAt("HOME")) env0
+          else env0 + ("HOME" -> user_home)
+
         val isabelle_home =
           if (this_isabelle_home != null) this_isabelle_home
           else