Author: Alexander Zangerl <az@debian.org>
Subject: path settings in *.MASTER and debian version display

--- a/exmh-async.MASTER
+++ b/exmh-async.MASTER
@@ -1,4 +1,4 @@
-#!wish -f
+#!/usr/bin/wish -f
 #
 # async editor frontend for exmh
 # Arg1: invoking interpreter's name (from [winfo name .])
--- a/exmh-bg.MASTER
+++ b/exmh-bg.MASTER
@@ -1,4 +1,4 @@
-#!wish -f
+#!/usr/bin/wish -f
 #
 # Background processing script for exmh.
 # This does stuff and then sends messages to the background module
@@ -18,6 +18,10 @@
 
 #CONFIGURATION
 #END CONFIGURATION
+# for safety so that old exmh config files don't keep it from starting
+set exmh(version) "version 2.8.0 04/21/2012 (/etc/exmh.conf is OLD)"
+source /etc/exmh.conf
+
 
 package require Tk
 wm withdraw .
--- a/exmh-strip.MASTER
+++ b/exmh-strip.MASTER
@@ -1,4 +1,4 @@
-#!wish
+#!/usr/bin/wish
 #(Note - you should also be able to use tclsh with this.)
 #
 # Utility to strip out attachments from MIME messages.
@@ -51,6 +51,10 @@ if {0} {
 
 #CONFIGURATION
 #END CONFIGURATION
+# for safety so that old exmh config files don't keep it from starting
+set exmh(version) "version 2.8.0 04/21/2012 (/etc/exmh.conf is OLD)"
+source /etc/exmh.conf
+
 
 if {[catch {wm withdraw .}]} {
     # Stub out stuff when not running under wish
--- a/exmh.MASTER
+++ b/exmh.MASTER
@@ -1,4 +1,4 @@
-#!wish -f
+#!/usr/bin/wish -f
 #
 # TK interface to the MH Mail utility
 # Brent Welch <welch@acm.org>
@@ -19,6 +19,12 @@
 #CONFIGURATION
 #END CONFIGURATION
 
+# for safety so that old exmh config files don't keep it from starting
+# old configs didn't include version
+set exmh(version) "version 2.8.0 04/21/2012 (/etc/exmh.conf is OLD)"
+source /etc/exmh.conf
+
+
 package require Tk
 if {$tcl_version < 8.5} {
     error "Tcl 8.5 or higher required."
--- a/ftp.expect.MASTER
+++ b/ftp.expect.MASTER
@@ -1,6 +1,4 @@
-#!/bin/sh
-# \
-exec expect -f
+#!/usr/bin/expect -f
 
 set site [lindex $argv 0]
 set dir [lindex $argv 1]
--- a/inc.expect.MASTER
+++ b/inc.expect.MASTER
@@ -1,6 +1,4 @@
-#!/bin/sh
-# \
-exec expect -f "$0" -- ${1+"$@"}
+#!/usr/bin/expect -f
 #
 # Script to run inc and provide a password.
 #
--- a/lib/app-defaults
+++ b/lib/app-defaults
@@ -241,7 +241,7 @@ exmh.iconic:		0
 *Main.help.m.l_faq:	Frequently Asked Questions
 *Main.help.m.c_faq:	Help exmh-faq
 *Main.help.m.l_html:	HTML Docs
-*Main.help.m.c_html:	Html_Window file:\$exmh(library)/html/index.html
+*Main.help.m.c_html:	Html_Window file:\$exmh(helploc)/index.html
 *Main.help.m.l_wiki:	Exmh Wiki
 *Main.help.m.c_wiki:	Html_Window http://www.beedub.com/cgi-bin/wiki.cgi/exmh
 *Main.help.m.t_sep:	separator
--- a/lib/help.tcl
+++ b/lib/help.tcl
@@ -82,7 +82,7 @@ proc Help { {name {Intro}} {title {Help
 	set id help$file
 	set topic $file
     } else {
-	set dir $exmh(library)/html
+	set dir $exmh(helploc)
 	set file $dir/$name.html
 	set id help$name
 	set topic $name
