emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/lisp/gnus ChangeLog nnfolder.el gnus-art....


From: Miles Bader
Subject: [Emacs-diffs] emacs/lisp/gnus ChangeLog nnfolder.el gnus-art....
Date: Wed, 14 Jan 2009 07:51:27 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     09/01/14 07:51:27

Modified files:
        lisp/gnus      : ChangeLog nnfolder.el gnus-art.el mm-util.el 

Log message:
        Merge from gnus--devo--0
        
        Revision: address@hidden/emacs--devo--0--patch-1517

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.789&r2=1.790
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/nnfolder.el?cvsroot=emacs&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/gnus-art.el?cvsroot=emacs&r1=1.174&r2=1.175
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/mm-util.el?cvsroot=emacs&r1=1.81&r2=1.82

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.789
retrieving revision 1.790
diff -u -b -r1.789 -r1.790
--- ChangeLog   10 Jan 2009 00:31:55 -0000      1.789
+++ ChangeLog   14 Jan 2009 07:51:26 -0000      1.790
@@ -1,8 +1,34 @@
+2009-01-14  Katsumi Yamaoka  <address@hidden>
+
+       * mm-util.el (mm-coding-system-priorities): Protect against nil value
+       of current-language-environment.
+
+2009-01-13  Reiner Steib  <address@hidden>
+
+       * nnfolder.el (nnfolder-read-folder): Check if most-positive-fixnum is
+       available at runtime.
+
+2009-01-13  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-art.el (article-date-ut): Fix end point of narrowing.
+
+2009-01-11  Aidan Kehoe  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-sum.el (gnus-summary-next-article): Revert last change by which
        XEmacs gets not to work.
 
+2009-01-09  Katsumi Yamaoka  <address@hidden>
+
+       * mm-util.el (mm-coding-system-priorities): Allow the value like
+       "Japanese (UTF-8)" of current-language-environment.
+
 2009-01-09  Glenn Morris  <address@hidden>
 
        * gnus-sum.el (gnus-summary-next-article): Replace last-command-char

Index: nnfolder.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/nnfolder.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- nnfolder.el 5 Jan 2009 03:22:12 -0000       1.38
+++ nnfolder.el 14 Jan 2009 07:51:26 -0000      1.39
@@ -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)

Index: gnus-art.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/gnus-art.el,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -b -r1.174 -r1.175
--- gnus-art.el 6 Jan 2009 11:39:20 -0000       1.174
+++ gnus-art.el 14 Jan 2009 07:51:26 -0000      1.175
@@ -3404,8 +3404,14 @@
                                    (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)
+         (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)

Index: mm-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mm-util.el,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- mm-util.el  9 Jan 2009 03:01:53 -0000       1.81
+++ mm-util.el  14 Jan 2009 07:51:27 -0000      1.82
@@ -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")
+  (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)))))
+          '(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.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]