# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1231919486 0
# Node ID a22ed49b5befa57628b2a48581dd2e2dc1e24dce
# Parent  c6160de1def77530d3fc2b1ae660da3541a4173d
Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1517

diff -r c6160de1def7 -r a22ed49b5bef lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Jan 14 03:50:46 2009 +0000
+++ b/lisp/gnus/ChangeLog	Wed Jan 14 07:51:26 2009 +0000
@@ -1,8 +1,34 @@
+2009-01-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-util.el (mm-coding-system-priorities): Protect against nil value
+	of current-language-environment.
+
+2009-01-13  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* nnfolder.el (nnfolder-read-folder): Check if most-positive-fixnum is
+	available at runtime.
+
+2009-01-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (article-date-ut): Fix end point of narrowing.
+
+2009-01-11  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* nnfolder.el (nnfolder-read-folder): The (lsh -1 -1) trick to generate
+	the greatest positive fixnum value doesn't work under an XEmacs with
+	bignum support; use the most-positive-fixnum constant instead,
+	available since Emacs 21.1 with cl and XEmacs 21.1.
+
 2009-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-sum.el (gnus-summary-next-article): Revert last change by which
 	XEmacs gets not to work.
 
+2009-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-util.el (mm-coding-system-priorities): Allow the value like
+	"Japanese (UTF-8)" of current-language-environment.
+
 2009-01-09  Glenn Morris  <rgm@gnu.org>
 
 	* gnus-sum.el (gnus-summary-next-article): Replace last-command-char
diff -r c6160de1def7 -r a22ed49b5bef lisp/gnus/gnus-art.el
--- a/lisp/gnus/gnus-art.el	Wed Jan 14 03:50:46 2009 +0000
+++ b/lisp/gnus/gnus-art.el	Wed Jan 14 07:51:26 2009 +0000
@@ -3404,9 +3404,15 @@
 				    (point) 'original-date))
 		     (setq date (get-text-property pos 'original-date))
 		     t))
-	  (narrow-to-region pos (or (text-property-any pos (point-max)
-						       'original-date nil)
-				    (point-max)))
+	  (narrow-to-region
+	   pos (if (setq pos (text-property-any pos (point-max)
+						'original-date nil))
+		   (progn
+		     (goto-char pos)
+		     (if (or (bolp) (eobp))
+			 (point)
+		       (1+ (point))))
+		 (point-max)))
 	  (goto-char (point-min))
 	  (when (re-search-forward tdate-regexp nil t)
 	    (setq bface (get-text-property (point-at-bol) 'face)
diff -r c6160de1def7 -r a22ed49b5bef lisp/gnus/mm-util.el
--- a/lisp/gnus/mm-util.el	Wed Jan 14 03:50:46 2009 +0000
+++ b/lisp/gnus/mm-util.el	Wed Jan 14 07:51:26 2009 +0000
@@ -840,13 +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 ((string= lang "Japanese")
-	       ;; 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.
diff -r c6160de1def7 -r a22ed49b5bef lisp/gnus/nnfolder.el
--- a/lisp/gnus/nnfolder.el	Wed Jan 14 03:50:46 2009 +0000
+++ b/lisp/gnus/nnfolder.el	Wed Jan 14 07:51:26 2009 +0000
@@ -925,7 +925,9 @@
 	      (active (or (cadr (assoc group nnfolder-group-alist))
 			  (cons 1 0)))
 	      (scantime (assoc group nnfolder-scantime-alist))
-	      (minid (lsh -1 -1))
+	      (minid (or (and (boundp 'most-positive-fixnum)
+			      most-positive-fixnum)
+			 (lsh -1 -1)))
 	      maxid start end newscantime
 	      novbuf articles newnum
 	      buffer-read-only)