Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5e8a94..bdb626b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2001-09-12  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+
+       * mm-util.el (mm-charset-synonym-alist): add windows-1250 so we
+       can read e-mails from Microsoft Outlook users not using ISO
+       8859-2 character set.
+
+2001-09-12 18:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-diary.el: Minor modifications to avoid warnings.
+       (gnus-summary-misc-menu): defvar.
+       (gnus-diary-check-message): Use gnus-point-at-eol.
+       (gnus-diary-kill-entire-line): eval-and-compile.
+
 2001-09-12  Didier Verna  <didier@xemacs.org>
 
        * nndiary.el: new version (0.2-b13).

diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el
index 71e0851..dfdd57c 100644 (file)
--- a/lisp/gnus-diary.el
+++ b/lisp/gnus-diary.el
@@ -268,6 +268,8 @@ Optional prefix (or REVERSE argument) means sort in reverse order."
   (interactive "P")
   (gnus-summary-sort 'schedule reverse))
 
+(defvar gnus-summary-misc-menu)
+
 (add-hook 'gnus-summary-menu-hook
          (lambda ()
            (easy-menu-add-item gnus-summary-misc-menu
@@ -335,14 +337,13 @@ Optional prefix (or REVERSE argument) means sort in reverse order."
 
 ;; Diary Message Checking ===================================================
 
-(if (fboundp 'kill-entire-line)
+(eval-and-compile
+  (if (fboundp 'kill-entire-line)
+      (defalias 'gnus-diary-kill-entire-line 'kill-entire-line)
     (defun gnus-diary-kill-entire-line ()
-      (kill-entire-line))
-  (defun gnus-diary-kill-entire-line ()
-    (beginning-of-line)
-    (let ((kill-whole-line t))
-      (kill-line)))
-  )
+      (beginning-of-line)
+      (let ((kill-whole-line t))
+       (kill-line)))))
 
 (defvar gnus-diary-header-value-history nil
   ;; History variable for header value prompting
@@ -394,7 +395,7 @@ If ARG (or prefix) is non-nil, force prompting for all fields."
           (when (re-search-forward (concat "^" header ":") nil t)
             (unless (eq (char-after) ? )
               (insert " "))
-            (setq value (buffer-substring (point) (point-at-eol)))
+            (setq value (buffer-substring (point) (gnus-point-at-eol)))
             (and (string-match "[ \t]*\\([^ \t]+\\)[ \t]*" value)
                  (setq value (match-string 1 value)))
             (condition-case ()

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 50899a3..007df10 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -169,6 +169,11 @@
     ;; `gnus-article-dumbquotes-map'.
     ,(unless (mm-coding-system-p 'windows-1252) ; should be defined eventually
        '(windows-1252 . iso-8859-1))
+    ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft
+    ;; Outlook users in Czech republic. Use this to allow reading of their
+    ;; e-mails. cp1250 should be defined by M-x codepage-setup.
+    ,(unless (mm-coding-system-p 'windows-1250)        ; should be defined eventually
+       '(windows-1250 . cp1250))
     (x-ctext . ctext))
   "A mapping from invalid charset names to the real charset names.")