Changes committed gnus/lisp (ChangeLog mm-util.el)

Modified: ChangeLog mm-util.el

(mm-coding-system-priorities): Protect against nil value
 of current-language-environment.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1978 gnus/lisp/ChangeLog:7.1979
--- ChangeLog:7.1978	Tue Jan 13 18:16:38 2009
+++ ChangeLog	Wed Jan 14 01:52:01 2009
@@ -1,3 +1,8 @@
+2009-01-14  Katsumi Yamaoka  <[email protected]>
+
+	* mm-util.el (mm-coding-system-priorities): Protect against nil value
+	of current-language-environment.
+
 2009-01-13  Reiner Steib  <[email protected]>
 
 	* nnfolder.el (nnfolder-read-folder): Check if most-positive-fixnum is
Index: mm-util.el
diff -u gnus/lisp/mm-util.el:7.90 gnus/lisp/mm-util.el:7.91
--- mm-util.el:7.90	Fri Jan  9 04:16:50 2009
+++ mm-util.el	Wed Jan 14 01:52:01 2009
@@ -840,14 +840,16 @@
   "A table of the difference character between ISO-8859-X and ISO-8859-15.")
 
 (defcustom mm-coding-system-priorities
-  (if (boundp 'current-language-environment)
-      (let ((lang (symbol-value 'current-language-environment)))
-	(cond (;; In XEmacs 21.5 it may be the one like "Japanese (UTF-8)".
-	       (string-match "\\`Japanese" lang)
-	       ;; Japanese users prefer iso-2022-jp to euc-japan or
-	       ;; shift_jis, however iso-8859-1 should be used when
-	       ;; there are only ASCII text and Latin-1 characters.
-	       '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))))
+  (let ((lang (if (boundp 'current-language-environment)
+		  (symbol-value 'current-language-environment))))
+    (cond (;; XEmacs without Mule but with `file-coding'.
+	   (not lang) nil)
+	  ;; In XEmacs 21.5 it may be the one like "Japanese (UTF-8)".
+	  ((string-match "\\`Japanese" lang)
+	   ;; Japanese users prefer iso-2022-jp to euc-japan or
+	   ;; shift_jis, however iso-8859-1 should be used when
+	   ;; there are only ASCII text and Latin-1 characters.
+	   '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8))))
   "Preferred coding systems for encoding outgoing messages.
 
 More than one suitable coding system may be found for some text.