Fixed text sending in XEmacs 21.5.28

Detailed changes:
> 2007-11-10  David Byers  <davby@ida.liu.se>
>
> 	* mime.el (lyskom-mime-charset-for-text-xemacs): Better
> 	diagnostics for XEmacs. Use server charset if text is ascii.
>
> 	* edit-text.el (lyskom-edit-send): Don't even attempt to send text
> 	with too many charsets.
>

src/ChangeLog

+2007-11-10  David Byers  <davby@ida.liu.se>
+
+	* mime.el (lyskom-mime-charset-for-text-xemacs): Better
+	diagnostics for XEmacs. Use server charset if text is ascii.
+
+	* edit-text.el (lyskom-edit-send): Don't even attempt to send text
+	with too many charsets.
+
 2007-08-01  Per Cederqvist  <ceder@ingate.com>
 
 	Fixed typos in docstrings.

src/edit-text.el

@@ -573,8 +573,7 @@ This runs `kom-send-text-hook' and (for backwards compatibility)
                   (if (and mime-charset (null charset))
                       (setq full-message
                             (lyskom-mime-encode-string full-message mime-charset))
-                    (when (lyskom-j-or-n-p 'too-many-languages)
-                      (keyboard-quit)))
+		    (lyskom-error (lyskom-get-string 'too-many-languages-error)))
 
                   ;; Add the charset data to the content type
 

src/english-strings.el

@@ -1611,6 +1611,7 @@ On since %#8s%#9s")
     (all-faqs-header . "All FAQs for %#1?b%[%#1M%]%[the server%]:\n")
 
     (too-many-languages . "Cannot code that many character sets. Send uncoded? ")
+    (too-many-languages-error . "Cannot code that many character sets. Unable to send text.")
     (too-many-content-types . "Cannot figure out what content type you want. Simplify the text.")
 
     (cross-reference-text-status-aux . "See text:              %10#1n /%#2P/")

src/mime.el

@@ -33,11 +33,15 @@
       (concat lyskom-clientversion-long
 	      "$Id$\n"))
 
-(lyskom-external-function mm-find-mime-charset)
+(lyskom-external-function mm-find-mime-charset-region)
 (defun lyskom-mime-charset-for-text-xemacs (start end)
-  (when (and (lyskom-try-require 'un-define)
-	     (lyskom-try-require 'mm-util))
-    (mm-find-mime-charset start end)))
+  (lyskom-try-require 'un-define)
+  (if (lyskom-try-require 'mm-util)
+      (let ((cs (mm-find-mime-charset-region start end)))
+	(cond ((null cs) lyskom-server-coding-system)
+	      ((null (cdr cs)) (car cs))
+	      (t nil)))
+    (lyskom-error "Unable to load required mm-util from gnus")))
 
 (defun lyskom-mime-charset-for-text-gnu (start end)
   (let ((codings (delq nil 

src/swedish-strings.el

@@ -1660,6 +1660,7 @@ Uppkopplad sedan %#8s%#9s")
     (all-faqs-header . "Alla FAQ till %#1?b%[%#1M%]%[servern%]:\n")
 
     (too-many-languages . "Fr mnga teckenuppsttningar fr att koda. Skicka in okodat? ")
+    (too-many-languages-error . "Fr mnga teckenuppsttningar fr att koda. Kan inte skicka in inlgget.")
     (too-many-content-types . "Kan inte avgra innehllstyp. Frenkla inlgget.")
 
     (cross-reference-text-status-aux . "Se ven inlgg:                 %10#1n /%#2P/")