Commit 37e256d2 authored by David Byers's avatar David Byers
Browse files

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.
>
parent 6ed1ce8c
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> 2007-08-01 Per Cederqvist <ceder@ingate.com>
Fixed typos in docstrings. Fixed typos in docstrings.
......
...@@ -573,8 +573,7 @@ This runs `kom-send-text-hook' and (for backwards compatibility) ...@@ -573,8 +573,7 @@ This runs `kom-send-text-hook' and (for backwards compatibility)
(if (and mime-charset (null charset)) (if (and mime-charset (null charset))
(setq full-message (setq full-message
(lyskom-mime-encode-string full-message mime-charset)) (lyskom-mime-encode-string full-message mime-charset))
(when (lyskom-j-or-n-p 'too-many-languages) (lyskom-error (lyskom-get-string 'too-many-languages-error)))
(keyboard-quit)))
;; Add the charset data to the content type ;; Add the charset data to the content type
......
...@@ -1611,6 +1611,7 @@ On since %#8s%#9s") ...@@ -1611,6 +1611,7 @@ On since %#8s%#9s")
(all-faqs-header . "All FAQs for %#1?b%[%#1M%]%[the server%]:\n") (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 . "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.") (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/") (cross-reference-text-status-aux . "See text: %10#1n /%#2P/")
......
...@@ -33,11 +33,15 @@ ...@@ -33,11 +33,15 @@
(concat lyskom-clientversion-long (concat lyskom-clientversion-long
"$Id$\n")) "$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) (defun lyskom-mime-charset-for-text-xemacs (start end)
(when (and (lyskom-try-require 'un-define) (lyskom-try-require 'un-define)
(lyskom-try-require 'mm-util)) (if (lyskom-try-require 'mm-util)
(mm-find-mime-charset start end))) (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) (defun lyskom-mime-charset-for-text-gnu (start end)
(let ((codings (delq nil (let ((codings (delq nil
......
...@@ -1660,6 +1660,7 @@ Uppkopplad sedan %#8s%#9s") ...@@ -1660,6 +1660,7 @@ Uppkopplad sedan %#8s%#9s")
(all-faqs-header . "Alla FAQ till %#1?b%[%#1M%]%[servern%]:\n") (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 . "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.") (too-many-content-types . "Kan inte avgra innehllstyp. Frenkla inlgget.")
(cross-reference-text-status-aux . "Se ven inlgg: %10#1n /%#2P/") (cross-reference-text-status-aux . "Se ven inlgg: %10#1n /%#2P/")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment