diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2001-10-13 00:03:20 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2001-10-13 00:03:20 +0000 |
| commit | 3bbdd8ce0a8c090f0034634b5c1e7adc5ee00136 (patch) | |
| tree | f2b6f2e731a03db68aab7c3bae4c058e1a951718 /mail/tkrat2 | |
| parent | Upgrade to StarOffice 6.0 (repo-copied from staroffice52). (diff) | |
A fix for my charset handling patch -- handling of messages
placed on hold.
A fix for an original problem -- if a chosen charset could not
represent all characters in the message, there was no way to go
back and choose another. Instead of returning `-1', the TCL
procedure was simply returning (`void').
Bump up portrevision.
Notes
Notes:
svn path=/head/; revision=48727
Diffstat (limited to 'mail/tkrat2')
| -rw-r--r-- | mail/tkrat2/Makefile | 1 | ||||
| -rw-r--r-- | mail/tkrat2/files/patch-charset | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile index 8c967e04b1d8..6dfa19d1417f 100644 --- a/mail/tkrat2/Makefile +++ b/mail/tkrat2/Makefile @@ -7,6 +7,7 @@ PORTNAME= tkrat PORTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= mail tk83 MASTER_SITES= ftp://ftp.md.chalmers.se/pub/tkrat/ \ ftp://ftp.sunet.se/pub/unix/mail/tkrat/ \ diff --git a/mail/tkrat2/files/patch-charset b/mail/tkrat2/files/patch-charset index c334132bf666..f81b156203f1 100644 --- a/mail/tkrat2/files/patch-charset +++ b/mail/tkrat2/files/patch-charset @@ -33,7 +33,7 @@ version comes out. - upvar #0 $mgh mh if [info exists mh(body)] { -@@ -411,15 +410,8 @@ +@@ -411,15 +410,10 @@ if [info exists p(charset)] { set charset $p(charset) - } else { @@ -44,6 +44,8 @@ version comes out. - } + } elseif [info exists mh(charset)] { + set charset $mh(charset) ++ } else { ++ set charset [encoding system] } - if {"auto" == $charset} { - set charset utf-8 @@ -84,6 +86,13 @@ version comes out. + # ComposeBuildStruct -- # +@@ -1066,5 +1092,5 @@ + if {0 != [RatDialog $mh(toplevel) $t(warning) $t(bad_charset) {} 0 \ + $t(continue) $t(abort)]} { +- return ++ return -1 + } + set charset $fallback @@ -1074,10 +1096,9 @@ lappend bh(parameter) [list charset $charset] } |