In these diffs, "exmh-2.6.3" is the distributed exmh, and
"exmh-sipbcvs" is the sipb version after I have made local
customizations.


diff -u -r exmh-2.6.3/exmh exmh-sipbcvs/exmh
--- exmh-2.6.3/exmh	Thu Apr  3 17:46:43 2003
+++ exmh-sipbcvs/exmh	Fri Feb 13 20:35:19 2004
@@ -1,4 +1,4 @@
-#!/usr10/home/welch/TclPro1.4/linux-ix86/bin/wish8.3 -f
+#!/afs/sipb/project/tcl/wish -f
 #
 # TK interface to the MH Mail utility
 # Brent Welch <welch@acm.org>
@@ -17,33 +17,47 @@
 
 # The following lines are patched by exmh.install
 #CONFIGURATION
-set wish /usr10/home/welch/TclPro1.4/linux-ix86/bin/wish8.3
-set exmh(version) {version 2.6.3 04/02/2003}
+set wish /afs/sipb/project/tcl/wish
+set exmh(version) {version 2.6.3 04/04/2003}
 set exmh(name) exmh
-set exmh(maintainer) welch@acm.org
-set mh_path /usr/pan/bin
-set exmh(slocal) /usr/lib/nmh/slocal
-set mime(dir) /usr/bin
-set mailcap_default /etc/mailcap
-set mimetypes_default /etc/mime.types
-set exmh(expect) /usr10/home/welch/TclPro1.4/linux-ix86/bin/expect
-set exmh(expectk) /usr10/home/welch/TclPro1.4/linux-ix86/bin/expectk
-set faces(dir) /usr/local/faces
+set exmh(maintainer) bug-sipb@mit.edu
+set mh_path /usr/athena/bin
+
+# jmorzins hack: deal with Athena 8.3, until things get fixed.
+set exmh(slocal) /usr/athena/etc/slocal
+if [file executable "/usr/athena/libexec/slocal"] {
+    set exmh(slocal) "/usr/athena/libexec/slocal"
+}
+# end jmorzins hack
+
+# geofft hack: deal with Debathena
+if [file executable "/usr/bin/metamail"] {
+    set mime(dir) "/usr/bin"
+} else {
+    set mime(dir) [exec athdir /afs/athena/project/mime bin]
+}
+# end geofft hack
+# set mime(dir) [exec athdir /afs/athena/project/mime bin]
+set mailcap_default /afs/sipb/project/sipb/share/mailcap
+set mimetypes_default /afs/sipb/project/sipb/share/mime.types
+set exmh(expect) {}
+set exmh(expectk) {}
+set faces(dir) {}
 set faces(set,user) {local users usenix misc}
 set faces(set,unknown) {domains unknown}
 set faces(set,news) news
-set faces(defaultDomain) panasas.com
+set faces(defaultDomain) mit.edu
 set faces(suffix) {xpm gif xbm}
-set pgp(pgp,path) /usr/local/bin
-set pgp(pgp5,path) /usr/local/bin
-set pgp(gpg,path) /usr/bin
-set pgp(pgp6,path) /usr/local/bin
-set glimpse(path) /usr/pan/bin
-set sound(cmd) {/usr/bin/play -v 38}
-set exmh(library) /usr10/home/welch/lib/exmh-2.6
-set install(dir,bin) /usr10/home/welch/bin
-set install(dir,man) /usr10/home/welch/man/manl
-set install(dir,lib) /usr10/home/welch/lib/exmh-2.6
+set pgp(pgp,path) [exec athdir /afs/athena/contrib/pgp bin]
+set pgp(pgp5,path) [exec athdir /afs/athena/contrib/pgp bin]
+set pgp(gpg,path) [exec athdir /afs/athena/contrib/pgp bin]
+set pgp(pgp6,path) [exec athdir /afs/athena/contrib/pgp bin]
+set glimpse(path) {}
+set sound(cmd) {play -v 38}
+set exmh(library) /mit/sipb/share/exmh-2.6.3
+set install(dir,bin) /afs/.sipb/project/sipb/share/exmh-2.6.3/bin
+set install(dir,man) /afs/.sipb/project/sipb/man/man1
+set install(dir,lib) /afs/.sipb/project/sipb/share/exmh-2.6.3
 
 #END CONFIGURATION
 
diff -u -r exmh-2.6.3/exmh-async exmh-sipbcvs/exmh-async
--- exmh-2.6.3/exmh-async	Thu Apr  3 17:46:43 2003
+++ exmh-sipbcvs/exmh-async	Fri Feb 13 20:33:36 2004
@@ -1,4 +1,4 @@
-#!/usr10/home/welch/TclPro1.4/linux-ix86/bin/wish8.3 -f
+#!/afs/sipb/project/tcl/wish -f
 #
 # async editor frontend for exmh
 # Arg1: invoking interpreter's name (from [winfo name .])
diff -u -r exmh-2.6.3/exmh-bg exmh-sipbcvs/exmh-bg
--- exmh-2.6.3/exmh-bg	Thu Apr  3 17:46:43 2003
+++ exmh-sipbcvs/exmh-bg	Fri Feb 13 20:35:32 2004
@@ -1,4 +1,4 @@
-#!/usr10/home/welch/TclPro1.4/linux-ix86/bin/wish8.3 -f
+#!/afs/sipb/project/tcl/wish -f
 #
 # Background processing script for exmh.
 # This does stuff and then sends messages to the background module
@@ -17,33 +17,47 @@
 # any specification.
 
 #CONFIGURATION
-set wish /usr10/home/welch/TclPro1.4/linux-ix86/bin/wish8.3
-set exmh(version) {version 2.6.3 04/02/2003}
+set wish /afs/sipb/project/tcl/wish
+set exmh(version) {version 2.6.3 04/04/2003}
 set exmh(name) exmh
-set exmh(maintainer) welch@acm.org
-set mh_path /usr/pan/bin
-set exmh(slocal) /usr/lib/nmh/slocal
-set mime(dir) /usr/bin
-set mailcap_default /etc/mailcap
-set mimetypes_default /etc/mime.types
-set exmh(expect) /usr10/home/welch/TclPro1.4/linux-ix86/bin/expect
-set exmh(expectk) /usr10/home/welch/TclPro1.4/linux-ix86/bin/expectk
-set faces(dir) /usr/local/faces
+set exmh(maintainer) bug-sipb@mit.edu
+set mh_path /usr/athena/bin
+
+# jmorzins hack: deal with Athena 8.3, until things get fixed.
+set exmh(slocal) /usr/athena/etc/slocal
+if [file executable "/usr/athena/libexec/slocal"] {
+    set exmh(slocal) "/usr/athena/libexec/slocal"
+}
+# end jmorzins hack
+
+# geofft hack: deal with Debathena
+if [file executable "/usr/bin/metamail"] {
+    set mime(dir) "/usr/bin"
+} else {
+    set mime(dir) [exec athdir /afs/athena/project/mime bin]
+}
+# end geofft hack
+# set mime(dir) [exec athdir /afs/athena/project/mime bin]
+set mailcap_default /afs/sipb/project/sipb/share/mailcap
+set mimetypes_default /afs/sipb/project/sipb/share/mime.types
+set exmh(expect) {}
+set exmh(expectk) {}
+set faces(dir) {}
 set faces(set,user) {local users usenix misc}
 set faces(set,unknown) {domains unknown}
 set faces(set,news) news
-set faces(defaultDomain) panasas.com
+set faces(defaultDomain) mit.edu
 set faces(suffix) {xpm gif xbm}
-set pgp(pgp,path) /usr/local/bin
-set pgp(pgp5,path) /usr/local/bin
-set pgp(gpg,path) /usr/bin
-set pgp(pgp6,path) /usr/local/bin
-set glimpse(path) /usr/pan/bin
-set sound(cmd) {/usr/bin/play -v 38}
-set exmh(library) /usr10/home/welch/lib/exmh-2.6
-set install(dir,bin) /usr10/home/welch/bin
-set install(dir,man) /usr10/home/welch/man/manl
-set install(dir,lib) /usr10/home/welch/lib/exmh-2.6
+set pgp(pgp,path) [exec athdir /afs/athena/contrib/pgp bin]
+set pgp(pgp5,path) [exec athdir /afs/athena/contrib/pgp bin]
+set pgp(gpg,path) [exec athdir /afs/athena/contrib/pgp bin]
+set pgp(pgp6,path) [exec athdir /afs/athena/contrib/pgp bin]
+set glimpse(path) {}
+set sound(cmd) {play -v 38}
+set exmh(library) /mit/sipb/share/exmh-2.6.3
+set install(dir,bin) /afs/.sipb/project/sipb/share/exmh-2.6.3/bin
+set install(dir,man) /afs/.sipb/project/sipb/man/man1
+set install(dir,lib) /afs/.sipb/project/sipb/share/exmh-2.6.3
 
 #END CONFIGURATION
 
diff -u -r exmh-2.6.3/exmh-strip exmh-sipbcvs/exmh-strip
--- exmh-2.6.3/exmh-strip	Thu Apr  3 17:46:43 2003
+++ exmh-sipbcvs/exmh-strip	Sat Feb 14 00:42:04 2004
@@ -1,4 +1,4 @@
-#!/usr10/home/welch/TclPro1.4/linux-ix86/bin/wish8.3
+#!/afs/sipb/project/tcl/wish
 #
 # Utility to strip out attachments from MIME messages.
 # They are replaced with references to the external files.
@@ -41,33 +41,47 @@
 # any specification.
 
 #CONFIGURATION
-set wish /usr10/home/welch/TclPro1.4/linux-ix86/bin/wish8.3
-set exmh(version) {version 2.6.3 04/02/2003}
+set wish /afs/sipb/project/tcl/wish
+set exmh(version) {version 2.6.3 04/04/2003}
 set exmh(name) exmh
-set exmh(maintainer) welch@acm.org
-set mh_path /usr/pan/bin
-set exmh(slocal) /usr/lib/nmh/slocal
-set mime(dir) /usr/bin
-set mailcap_default /etc/mailcap
-set mimetypes_default /etc/mime.types
-set exmh(expect) /usr10/home/welch/TclPro1.4/linux-ix86/bin/expect
-set exmh(expectk) /usr10/home/welch/TclPro1.4/linux-ix86/bin/expectk
-set faces(dir) /usr/local/faces
+set exmh(maintainer) bug-sipb@mit.edu
+set mh_path /usr/athena/bin
+
+# jmorzins hack: deal with Athena 8.3, until things get fixed.
+set exmh(slocal) /usr/athena/etc/slocal
+if [file executable "/usr/athena/libexec/slocal"] {
+    set exmh(slocal) "/usr/athena/libexec/slocal"
+}
+# end jmorzins hack
+
+# geofft hack: deal with Debathena
+if [file executable "/usr/bin/metamail"] {
+    set mime(dir) "/usr/bin"
+} else {
+    set mime(dir) [exec athdir /afs/athena/project/mime bin]
+}
+# end geofft hack
+# set mime(dir) [exec athdir /afs/athena/project/mime bin]
+set mailcap_default /afs/sipb/project/sipb/share/mailcap
+set mimetypes_default /afs/sipb/project/sipb/share/mime.types
+set exmh(expect) {}
+set exmh(expectk) {}
+set faces(dir) {}
 set faces(set,user) {local users usenix misc}
 set faces(set,unknown) {domains unknown}
 set faces(set,news) news
-set faces(defaultDomain) panasas.com
+set faces(defaultDomain) mit.edu
 set faces(suffix) {xpm gif xbm}
-set pgp(pgp,path) /usr/local/bin
-set pgp(pgp5,path) /usr/local/bin
-set pgp(gpg,path) /usr/bin
-set pgp(pgp6,path) /usr/local/bin
-set glimpse(path) /usr/pan/bin
-set sound(cmd) {/usr/bin/play -v 38}
-set exmh(library) /usr10/home/welch/lib/exmh-2.6
-set install(dir,bin) /usr10/home/welch/bin
-set install(dir,man) /usr10/home/welch/man/manl
-set install(dir,lib) /usr10/home/welch/lib/exmh-2.6
+set pgp(pgp,path) [exec athdir /afs/athena/contrib/pgp bin]
+set pgp(pgp5,path) [exec athdir /afs/athena/contrib/pgp bin]
+set pgp(gpg,path) [exec athdir /afs/athena/contrib/pgp bin]
+set pgp(pgp6,path) [exec athdir /afs/athena/contrib/pgp bin]
+set glimpse(path) {}
+set sound(cmd) {play -v 38}
+set exmh(library) /mit/sipb/share/exmh-2.6.3
+set install(dir,bin) /afs/.sipb/project/sipb/share/exmh-2.6.3/bin
+set install(dir,man) /afs/.sipb/project/sipb/man/man1
+set install(dir,lib) /afs/.sipb/project/sipb/share/exmh-2.6.3
 
 #END CONFIGURATION
 
diff -u -r exmh-2.6.3/ftp.expect exmh-sipbcvs/ftp.expect
--- exmh-2.6.3/ftp.expect	Thu Apr  3 17:46:43 2003
+++ exmh-sipbcvs/ftp.expect	Fri Feb 13 20:33:36 2004
@@ -1,6 +1,6 @@
 #!/bin/sh
 # \
-exec /usr10/home/welch/TclPro1.4/linux-ix86/bin/expect -f
+exec expect -f
 
 set site [lindex $argv 0]
 set dir [lindex $argv 1]
diff -u -r exmh-2.6.3/inc.expect exmh-sipbcvs/inc.expect
--- exmh-2.6.3/inc.expect	Thu Apr  3 17:46:43 2003
+++ exmh-sipbcvs/inc.expect	Fri Feb 13 20:33:36 2004
@@ -1,6 +1,6 @@
 #!/bin/sh
 # \
-exec /usr10/home/welch/TclPro1.4/linux-ix86/bin/expect -f "$0" -- ${1+"$@"}
+exec expect -f "$0" -- ${1+"$@"}
 #
 # Script to run inc and provide a password.
 #


diff -u -r exmh-2.6.3/lib/app-defaults exmh-sipbcvs/lib/app-defaults
--- exmh-2.6.3/lib/app-defaults	Mon Mar 31 00:07:34 2003
+++ exmh-sipbcvs/lib/app-defaults	Fri Feb 13 20:57:16 2004
@@ -51,11 +51,11 @@
 
 ! Fonts
 
-*font: fixed
+*font: 6x13
 
 !*Ftoc*Text.font: 6x10
-!*Msg*Text.font: fixed
-!*Sedit*Text.font: fixed
+!*Msg*Text.font: 6x13
+!*Sedit*Text.font: 6x13
 
 ! Tk widgets:
 
@@ -192,7 +192,7 @@
 !	fl_ygap	  - gap between labels, Y direction
 
 *fl_toplevel: 0
-*fl_font: fixed
+*fl_font: 6x13
 *fl_tarbutton: 3
 *fl_navbutton: 2
 *fl_curbutton: 1
@@ -678,7 +678,7 @@
 ! are found for a particular characterset/display style,  a wildcard
 ! is used for the family.
 ! These may be overridden by users.
-*mime_us-ascii_plain_families:	fixed clean lucidatypewriter courier terminal
+*mime_us-ascii_plain_families:	6x13 clean lucidatypewriter courier terminal
 *mime_us-ascii_fixed_families:	lucidatypewriter fixed clean courier terminal
 *mime_us-ascii_proportional_families:	times "new century schoolbook" \
 					lucidabright charter lucida helvetica
@@ -1211,17 +1211,17 @@
 
 *sedit_key_selpaste:	 <Control-y> <Key-F18>
 
-*sedit_key_seldelete:	 <Control-w> <Key-Delete> <Key-F20>
+*sedit_key_seldelete:	 <Control-w> <Key-F20>
 *sedit_key_selcopy:	 <Key-F16>
-*sedit_key_backspace:	 <Control-h> <Key-BackSpace>
+*sedit_key_backspace:	 <Control-h> <Key-BackSpace> <Key-Delete>
 *sedit_key_openline:	 <Control-o>
 *sedit_key_deleol:	 <Control-k>
 *sedit_key_delbol:	 <Control-x><Key-Delete>
 *sedit_key_delwordforw:	 <Meta-d>
-*sedit_key_delwordback:	 <Meta-h>
+*sedit_key_delwordback:	 <Meta-h> <Meta-Key-BackSpace> <Meta-Key-Delete>
 *sedit_key_delchar:	 <Control-d>
-*sedit_key_transpose:	 <Control-t>
-*sedit_key_transemacs:
+*sedit_key_transpose:
+*sedit_key_transemacs:	 <Control-t>
 *sedit_key_transword:	 <Meta-t>
 
 *sedit_key_composechar:	 <Multi_key>

diff -u -r exmh-2.6.3/lib/error.tcl exmh-sipbcvs/lib/error.tcl
--- exmh-2.6.3/lib/error.tcl	Thu Feb 28 00:13:46 2002
+++ exmh-sipbcvs/lib/error.tcl	Fri Feb 13 21:11:38 2004
@@ -31,7 +31,7 @@
     }
     set font fixed
     set base ".errorInfo"
-    set title "Error Info"
+    set title "Exmh Error Information"
     if [info exists errorInfo] {
 	set savedErrorInfo $errorInfo
     } else {
@@ -60,26 +60,35 @@
     
 	button $name.buttons.quit -text "Dismiss" -command [list destroy $name]
 	pack append $name.buttons $name.buttons.quit {left}
-	if [info exists exmh(maintainer)] {
-	    button $name.buttons.mailto -text "Mail to $exmh(maintainer)" -command [list ExmhMailError $name $errorInfo]
-	    pack append $name.buttons $name.buttons.mailto {right}
-	}
+# I have deliberately disabled this.
+#
+#	 if [info exists exmh(maintainer)] {
+#	     button $name.buttons.mailto -text "Mail to $exmh(maintainer)" -command [list ExmhMailError $name $errorInfo]
+#	     pack append $name.buttons $name.buttons.mailto {right}
+#	 }
 	global widgetText TextType
 
 	message $name.ex -font $font -aspect 1000 -text \
-"Please type a few words of explanation before
-pressing the Mail to button, or just Dismiss me."
+"You are seeing this message because Exmh had an internal error.
+
+The details of the error are given at the bottom of this window.
+(The first three lines are typically the most useful.)
+
+Exmh will try to continue running normally.  (Exmh is not
+smart enough to be able to predict if the problem will persist.)
+"
+
 	pack $name.ex -side top -fill x
-	text $name.user -font $font -width 60 -bd 2 -relief raised
-	$name.user configure -height 5
-	$name.user insert end "What happened: "
-	$name.user tag add sel 1.0 1.14
-	focus $name.user
-	pack $name.user -side top -fill both -expand true
-	$name.user mark set hlimit 1.0
-	set widgetText($name.user,extend) 0
-	set widgetText($name.user,geo) {}
-	set TextType($name.user) text
+#	text $name.user -font $font -width 60 -bd 2 -relief raised
+#	$name.user configure -height 5
+#	$name.user insert end "What happened: "
+#	$name.user tag add sel 1.0 1.14
+#	focus $name.user
+#	pack $name.user -side top -fill both -expand true
+#	$name.user mark set hlimit 1.0
+#	set widgetText($name.user,extend) 0
+#	set widgetText($name.user,geo) {}
+#	set TextType($name.user) text
 
 	frame $name.msg
 	pack $name.msg -side top -fill both -expand true
@@ -99,6 +108,29 @@
 	set widgetText($name.msg.t,geo) {}
 	set TextType($name.msg.t) text
 
+	if [catch {Check_Quota} qp] {
+	    puts stderr $qp
+	} elseif { $qp >= 100 } {
+	    if [catch {Warn_Quota $name $qp} result] {
+		puts stderr $result
+	    } else {
+		set error_quota "\"fs lq \$HOME\" reports $qp% quota usage.\n"
+#		focus $name.user
+	    }
+	}
+
+	if [catch {Check_Multiple_Exmh} num] {
+	    puts stderr $num
+	} elseif { $num >= 2 } {
+	    if [catch {Warn_Multiple_Exmh $name $num} result] {
+		puts stderr $result
+	    } else {
+		set error_multiple "\"ps\" seemed to think that $num simultaneous copies of exmh were running.\n"
+#		focus $name.user
+	    }
+	}
+
+
 	Visibility_Wait $name
 
     } oops] {
@@ -115,6 +147,111 @@
     }
 }
 proc bgerror [info args tkerror] [info body tkerror]
+
+
+proc Check_Quota {} {
+    global env mhProfile
+
+    if [catch {open "|fs lq $env(HOME)"} input] {
+#	Exmh_Error {Uh-oh!  I couldn't run the command "fs lq $HOME"}
+	puts stderr $input
+    } else {
+	set numBytes [gets $input line]		;# Discard
+	while {$numBytes > 0} {
+	    if [regexp "user\.$env(USER)\[ \t]+\[0-9]+\[ \t]+\[0-9]+\[ \t]+(\[0-9]+)" $line match qp] {
+		set quota_pct $qp
+	    }
+	    set numBytes [gets $input line]
+	}
+	return $quota_pct
+    }
+    return 0
+}
+
+proc Warn_Quota {w qp} {
+    global exmhError
+    if [winfo exists $w.extra] {
+	  destroy $w.extra
+    }
+    set f [frame $w.extra -class Dialog -bd 4 -relief ridge]
+    Widget_Message $f msg -aspect 1000 -text \
+"Warning!
+
+It looks like your Athena account may be over its quota!
+(Your quota usage is $qp%, as reported by \"fs lq \$HOME\".)
+
+When your account is over quota, exmh starts experiencing
+errors, because it can't save new files into your account.
+
+\"olc answers\" has a stock answer for what to do when
+your account is over quota.  (It's in the Accounts section.)"
+
+    set but [Widget_Frame $f but Dialog {top expand fill} -bd 10]
+    set exmhError(continue) 0
+    Widget_AddBut $but continue "continue" { set exmhError(continue) 1 }
+    $but.continue configure -padx 6m -pady 1m -bd 4
+    focus $but
+    bind $but <Return> "$but.continue flash ; $but.continue invoke"
+    Widget_PlaceDialog $w $w.extra
+    Visibility_Wait $but
+    catch {grab $but}
+    tkwait variable exmhError(continue)
+    catch {grab release $but}
+    destroy $w.extra
+    return $exmhError(continue)
+}
+
+proc Check_Multiple_Exmh {} {
+    if [catch {open "|ps"} input] {
+	puts stderr $input
+    } else {
+	set count 0
+	set numBytes [gets $input line]		;# Discard
+	while {$numBytes > 0} {
+	    if [regexp "\[/ \t]exmh($|\[ \t])" $line] {
+		incr count
+	    }
+	    set numBytes [gets $input line]
+	}
+	return $count 
+    }
+    return 0
+}
+
+proc Warn_Multiple_Exmh {w num} {
+    global exmhError
+    if [winfo exists $w.extra] {
+	  destroy $w.extra
+    }
+    set f [frame $w.extra -class Dialog -bd 4 -relief ridge]
+    Widget_Message $f msg -aspect 1000 -text \
+"Warning!
+
+It looks like you may be running $num copies of the exmh
+program at the same time.
+
+In general, this is bad, because if two exmh's try to change
+your files at the same time, you can receive spurious error
+messages (of which this may be an example).
+
+If you really are running simultaneous copies of exmh,
+I advise quitting all but one."
+
+    set but [Widget_Frame $f but Dialog {top expand fill} -bd 10]
+    set exmhError(continue) 0
+    Widget_AddBut $but continue "continue" { set exmhError(continue) 1 }
+    $but.continue configure -padx 6m -pady 1m -bd 4
+    focus $but
+    bind $but <Return> "$but.continue flash ; $but.continue invoke"
+    Widget_PlaceDialog $w $w.extra
+    Visibility_Wait $but
+    catch {grab $but}
+    tkwait variable exmhError(continue)
+    catch {grab release $but}
+    destroy $w.extra
+    return $exmhError(continue)
+}
+
 
 proc ExmhMailError { w errInfo } {
     global exmh

diff -u -r exmh-2.6.3/lib/extrasInit.tcl exmh-sipbcvs/lib/extrasInit.tcl
--- exmh-2.6.3/lib/extrasInit.tcl	Wed Apr  2 00:21:21 2003
+++ exmh-sipbcvs/lib/extrasInit.tcl	Fri Feb 13 21:32:26 2004
@@ -78,7 +78,7 @@
 "Enables the window that summarizes your sequences.
 (Sequences Window Preferences.)" }
 
-	{ sound(enabled) soundEnabled ON {Sound feedback}
+	{ sound(enabled) soundEnabled OFF {Sound feedback}
 "Enable audio feedback.  Exmh will make a sound when
 new messages are incorporated into your folders
 (except during startup) and when you try to change
@@ -366,7 +366,7 @@
     Preferences_Add "Sound" \
 "Exmh can provide audio feedback.  It can ring your terminal bell, or play audio files." \
     [list \
-	{ sound(enabled) soundEnabled ON {Sound feedback}
+	{ sound(enabled) soundEnabled OFF {Sound feedback}
 "Enable audio feedback.  Exmh will make a sound when
 new messages are incorporated into your folders
 (except during startup) and when you try to change








diff -u -r exmh-2.6.3/lib/pgpWWW.tcl exmh-sipbcvs/lib/pgpWWW.tcl
--- exmh-2.6.3/lib/pgpWWW.tcl	Tue Sep 10 02:00:42 2002
+++ exmh-sipbcvs/lib/pgpWWW.tcl	Fri Feb 13 21:30:59 2004
@@ -14,7 +14,7 @@
 global pgp
 
 # preferences
-set pgp(pref,keyserver) { keyserver KeyServer "pgp-public-keys@keys.pgp.net"
+set pgp(pref,keyserver) { keyserver KeyServer "pgp-public-keys@pgp.mit.edu"
 {Favorite public key server}
 "When a signature check fails because of a missing key,
 exmh allows you to ask a key server for the key.
@@ -28,7 +28,7 @@
 See also http://www.pgp.net/pgpnet/" }
 #
 set pgp(pref,keyserverUrl) { keyserverUrl KeyServerURL 
-{http://keys.pgp.com:11371/pks/lookup?op=get&exact=on&search=0x%s}
+{http://pgp.mit.edu:11371/pks/lookup?op=get&exact=on&search=0x%s}
 {URL to fetch keys interactively}
 "The WWW keyserver is forms based.  Enter a URL here where
 the key id (sans 0x) is substituted with %s (using format)" }



diff -u -r exmh-2.6.3/lib/seditBind.tcl exmh-sipbcvs/lib/seditBind.tcl
--- exmh-2.6.3/lib/seditBind.tcl	Thu Jul 25 14:49:38 2002
+++ exmh-sipbcvs/lib/seditBind.tcl	Fri Feb 13 21:18:44 2004
@@ -24,7 +24,7 @@
     foreach editproc [option get . sedit_editprocs {}] {
 	set sedit(key,$editproc) [option get . sedit_key_$editproc {}]
     }
-    Preferences_Resource sedit(pasteSetsInsert) sedit_pasteSetsInsert 1
+    Preferences_Resource sedit(pasteSetsInsert) sedit_pasteSetsInsert 0
     Preferences_Resource sedit(typeKillsSel) sedit_typeKillsSel 1
     Preferences_Resource sedit(scrollButton) sedit_scrollButton Middle
 

diff -u -r exmh-2.6.3/lib/uri.tcl exmh-sipbcvs/lib/uri.tcl
--- exmh-2.6.3/lib/uri.tcl	Tue Jul 23 14:06:42 2002
+++ exmh-sipbcvs/lib/uri.tcl	Sat Feb 14 00:25:53 2004
@@ -58,7 +58,7 @@
 	{uri(mosaicApp) uriMosaicApp	{Mosaic} {Mosaic program name}
 "This is the name of the binary program that corresponds to the
 Mosaic viewer option.  For example, some sites use \"xmosaic\"."}
-	{uri(netscapeCmd) uriNetscapeCmd	{} {Netscape command}
+	{uri(netscapeCmd) uriNetscapeCmd	{htmlview $xuri} {Netscape command}
 "This is the netscape command used to contact netscape and/or start it up.
 The -remote openURL($xuri) is removed in order to start up netscape.
 Various examples might be:



