* etc/mhn.defaults.sh: Never try to make mhshow start xterm.

diff --git a/ChangeLog b/ChangeLog
index b2ea1aa73dfb20e4cace8e0b91cda72d2476320d..52e56ed56af4206e7e0e3664e868dec119d8f79c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-17  Eric Gillespie  <epg@pretzelnet.org>
+
+       * etc/mhn.defaults.sh: Never try to make mhshow start xterm.
+

 2009-01-16  Eric Gillespie  <epg@pretzelnet.org>
 
        * test/runtest, test/tests/inc/test-deb359167,
 2009-01-16  Eric Gillespie  <epg@pretzelnet.org>
 
        * test/runtest, test/tests/inc/test-deb359167,

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 7fd6b15f5921f6ecfc20634b8875747d9b526deb..47b010617dda486a7dd866115c15c3c7bc2d55ff 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -14,3 +14,5 @@ Things to add to the release notes for the next full release:
   folder, changing to previous such folder, and scanning all such folders,
   respectively.  This is based on Luke Mewburn's 'new':
   http://www.mewburn.net/luke/src/new
   folder, changing to previous such folder, and scanning all such folders,
   respectively.  This is based on Luke Mewburn's 'new':
   http://www.mewburn.net/luke/src/new

+- nmh will no longer attempt to install a mhn.defaults file that causes mhshow
+  to open its own xterms.

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index e25cac42f866ddaa443388bbf8b980d34db58460..fc5a668209e3d0b8ce0510160cab541475b0cd65 100755 (executable)
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -154,11 +154,6 @@ if [ ! -z "$PGM" ]; then
        echo "mhshow-suffix-application/msword: .doc" >> $TMP
 fi
 
        echo "mhshow-suffix-application/msword: .doc" >> $TMP
 fi
 

-PGM="`$SEARCHPROG $SEARCHPATH xterm`"
-if [ ! -z "$PGM" ]; then
-       echo "mhshow-charset-iso-8859-1: xterm -fn '-*-*-medium-r-normal-*-*-120-*-*-c-*-iso8859-*' -e %s" >> $TMP
-fi
-

 # output a sorted version of the file
 sort < $TMP
 
 # output a sorted version of the file
 sort < $TMP