From 3bbdd8ce0a8c090f0034634b5c1e7adc5ee00136 Mon Sep 17 00:00:00 2001
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Sat, 13 Oct 2001 00:03:20 +0000
Subject: 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.
---
 mail/tkrat2/files/patch-charset | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'mail/tkrat2/files/patch-charset')

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]
  	}
-- 
cgit v1.2.3