Merge from gnus--devo--0

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

4 files changed, 48 insertions, 11 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8a1d9a33ef3..fdac5e47491 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 2237fd65187..0e8dede98f3 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3404,9 +3404,15 @@ should replace the \"Date:\" one, or should be added below it."
                                     (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 --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 3d8538d4a61..403d967f8e4 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -840,13 +840,16 @@ Valid elements include:
   "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 --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index b8fc7088b34..6ba4aff6cc7 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -925,7 +925,9 @@ deleted.  Point is left where the deleted region was."
               (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)