More cleaned and conversion to the new parameter API.

[nmh] / etc / mhn.defaults.sh

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 08d08cf70caeffd63d7dade86fe9e9454eed3277..2f91a965da014468c8aded58e98786e430c6373a 100755 (executable)
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -33,7 +33,8 @@ elif [ ! -z "`$SEARCHPROG $SEARCHPATH lynx`" ]; then
   echo "mhfixmsg-format-text/html: lynx -child -dump -force_html '%F' | \
 expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
 elif [ ! -z "`$SEARCHPROG $SEARCHPATH elinks`" ]; then
-  echo "mhfixmsg-format-text/html: elinks -dump -force-html -no-numbering '%F'" >> $TMP
+  echo "mhfixmsg-format-text/html: elinks -dump -force-html -no-numbering \
+-eval 'set document.browse.margin_width = 0' '%F'" >> $TMP
 fi
 
 
@@ -206,7 +207,12 @@ EOF
 # that another netscape is already running and certain things can't be done).
 PGM="`$SEARCHPROG $SEARCHPATH lynx`"
 if [ ! -z "$PGM" ]; then
-       echo "mhshow-show-text/html: %p$PGM '%F'" >> $TMP
+       echo "mhshow-show-text/html: %p$PGM -force-html '%F'" >> $TMP
+else
+  PGM="`$SEARCHPROG $SEARCHPATH w3m`"
+  if [ ! -z "$PGM" ]; then
+       echo "mhshow-show-text/html: %p$PGM -T text/html '%F'" >> $TMP
+  fi
 fi
 
 PGM="`$SEARCHPROG $SEARCHPATH richtext`"