diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2001-06-26 23:50:47 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2001-06-26 23:50:47 +0000 |
| commit | 37fba6c89a39c2ec8bcbff63f14b6a4760f44d98 (patch) | |
| tree | 79ede3ba8a6c0924d235341ced6a775d55ba4992 /mail | |
| parent | Upgrade to 2.0.2. Add a big patch, which corrects handling of charsets (diff) | |
Minor cleanup of the patch...
Notes
Notes:
svn path=/head/; revision=44482
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/tkrat2/files/patch-charset | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mail/tkrat2/files/patch-charset b/mail/tkrat2/files/patch-charset index 66aa2606ce7a..c334132bf666 100644 --- a/mail/tkrat2/files/patch-charset +++ b/mail/tkrat2/files/patch-charset @@ -15,11 +15,15 @@ version comes out. --- tkrat/compose.tcl Tue Feb 13 00:59:37 2001 +++ tkrat/compose.tcl Tue Jun 26 14:29:18 2001 -@@ -49,4 +48,6 @@ +@@ -49,4 +49,10 @@ } set handler [$msg reply $to] + global $handler -+ array set $handler [list charset [[$msg body] parameter charset]] ++ set charset [[$msg body] parameter charset] ++ if {"" == $charset} { ++ set charset auto ;# or US-ASCII? ++ } ++ array set $handler [list charset $charset] return [DoCompose $handler \ [expr {($option(reply_bottom)) ? "1" : "-1"}] \ @@ -377,6 +378,4 @@ @@ -48,7 +52,7 @@ version comes out. + ConfigureEncoding $fh [SaneCharset $charset] set mh(data) [read $fh] close $fh -@@ -1024,4 +1017,32 @@ +@@ -1024,4 +1017,31 @@ } +# Cache the known charsets for subsequent SaneCharset invocations: @@ -56,7 +60,6 @@ version comes out. + +proc SaneCharset args { + global charsetMapping KnownCharsets -+ puts "SaneCharset: going through ``$args''" + foreach charset $args { + if {[info exists charsetMapping($charset)]} { + set charset $charsetMapping($charset) |