From 8bfe4ace914f778f289e763761981affe90a624e Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 26 Oct 2017 17:03:56 -0400
Subject: default XPA_METHOD is now localhost

---
 ds9/doc/release/r7.6.html | 1 +
 ds9/library/xpa.tcl       | 5 +++++
 make.include              | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ds9/doc/release/r7.6.html b/ds9/doc/release/r7.6.html
index a78195d..745ac72 100644
--- a/ds9/doc/release/r7.6.html
+++ b/ds9/doc/release/r7.6.html
@@ -152,6 +152,7 @@
         <li><tt><b>10.18.2017 RELEASE version 7.6b7</b></tt></li>
         <li><tt>10.26.2017 XPA: updated to version 2.1.18+.</tt></li>
         <li><tt>10.26.2017 CUBE: be sure to raise Cube Dialog when cube data is loaded via command line.</tt></li>
+        <li><tt>10.26.2017 XPA: default XPA_METHOD is now localhost.</tt></li>
         <li><tt><b>xx.xx.2017 RELEASE version 7.6b8</b></tt></li>
       </ol>
     </ol>
diff --git a/ds9/library/xpa.tcl b/ds9/library/xpa.tcl
index 28c4de8..2f90cab 100644
--- a/ds9/library/xpa.tcl
+++ b/ds9/library/xpa.tcl
@@ -9,6 +9,10 @@ proc InitXPA {} {
     global pds9
     global env
 
+    if {![info exists env(XPA_METHOD)]} {
+	set env(XPA_METHOD) localhost
+    }
+
     switch -- $ds9(wm) {
 	x11 -
 	win32 {}
@@ -2169,6 +2173,7 @@ proc XPAIsLocal {} {
 
     if {[info exists env(XPA_METHOD)]} {
 	switch $env(XPA_METHOD) {
+	    localhost -
 	    unix -
 	    local {return 1}
 	}
diff --git a/make.include b/make.include
index 39fb44f..706d83f 100644
--- a/make.include
+++ b/make.include
@@ -17,7 +17,7 @@
 # wcssubs 3.9.0
 # funtools 1.4.7
 # zlib 1.2.8
-# xpa 2.1.18
+# xpa 2.1.18+
 # libxml2 2.9.4
 # libxslt 1.1.29
 # openssl 1.0.2k
-- 
cgit v0.12