Synch to No Gnus 200409131255.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4826510..a3ad074 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2004-09-13  Simon Josefsson  <jas@extundo.com>
+
+       * nnimap.el (nnimap-demule): Revert 2004-08-30 change.
+
+       * dns-mode.el (dns-mode): Fix menu for XEmacs, reported by Steve
+       Youngs <steve@youngs.au.com> and suggested by Katsumi Yamaoka
+       <yamaoka@jpl.org>.
+       (dns-mode-font-lock-keywords): Fix faces, reported by Steve Youngs
+       <steve@youngs.au.com> and suggested by Katsumi Yamaoka
+       <yamaoka@jpl.org>.
+
+       * sieve.el (sieve-manage-mode): Ditto.
+
 2004-09-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-sum.el (gnus-summary-copy-article): Fixed doc string.

diff --git a/lisp/dns-mode.el b/lisp/dns-mode.el
index d484bfb..db38277 100644 (file)
--- a/lisp/dns-mode.el
+++ b/lisp/dns-mode.el
@@ -41,7 +41,8 @@
 
 ;;; Release history:
 
-;; 2004-09-11  posted on gnu.emacs.sources
+;; 2004-09-11  Posted on gnu.emacs.sources.
+;; 2004-09-13  Ported to XEmacs.
 
 ;;; Code:
 
@@ -77,11 +78,11 @@
   "Name of face used for DNS classes, e.g., IN.")
 
 (defcustom dns-mode-font-lock-keywords
-  `(("^$ORIGIN" 0 dns-mode-control-entity-face)
-    ("^$INCLUDE" 0 dns-mode-control-entity-face)
-    ("^$[a-z0-9A-Z]+" 0 dns-mode-bad-control-entity-face)
-    (,(regexp-opt dns-mode-classes) 0 dns-mode-class-face)
-    (,(regexp-opt dns-mode-types) 0 dns-mode-type-face))
+  `(("^$ORIGIN" 0 ,dns-mode-control-entity-face)
+    ("^$INCLUDE" 0 ,dns-mode-control-entity-face)
+    ("^$[a-z0-9A-Z]+" 0 ,dns-mode-bad-control-entity-face)
+    (,(regexp-opt dns-mode-classes) 0 ,dns-mode-class-face)
+    (,(regexp-opt dns-mode-types) 0 ,dns-mode-type-face))
   "Font lock keywords used to highlight text in DNS master file mode."
   :type 'sexp
   :group 'dns-mode)
@@ -131,7 +132,7 @@ Turning on DNS mode runs `dns-mode-hook'."
   (unless (featurep 'xemacs)
     (set (make-local-variable 'font-lock-defaults)
         '(dns-mode-font-lock-keywords nil nil ((?_ . "w")))))
-  (easy-menu-add-item nil nil dns-mode-menu))
+  (easy-menu-add dns-mode-menu dns-mode-map))
 
 ;; Tools.
 

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 944c814..4358ca4 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -851,9 +851,11 @@ function is generally only called when Gnus is shutting down."
   ;; BEWARE: we used to use string-as-multibyte here which is braindead
   ;; because it will turn accidental emacs-mule-valid byte sequences
   ;; into multibyte chars.  --Stef
-  (funcall (if (and (fboundp 'string-to-multibyte)
-                   (subrp (symbol-function 'string-to-multibyte)))
-              'string-to-multibyte
+  ;; Reverted, braindead got 7.5 out of 10 on imdb, so it can't be
+  ;; that bad. --Simon
+  (funcall (if (and (fboundp 'string-as-multibyte)
+                   (subrp (symbol-function 'string-as-multibyte)))
+              'string-as-multibyte
             'identity)
           (or string "")))
 

diff --git a/lisp/sieve.el b/lisp/sieve.el
index 2b044ad..35fd917 100644 (file)
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -1,5 +1,5 @@
 ;;; sieve.el --- Utilities to manage sieve scripts
-;; Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
@@ -143,7 +143,7 @@ require \"fileinto\";
   (setq mode-name "SIEVE")
   (buffer-disable-undo (current-buffer))
   (setq truncate-lines t)
-  (easy-menu-add-item nil nil sieve-manage-mode-menu))
+  (easy-menu-add sieve-manage-mode-menu sieve-manage-mode-map))
 
 (put 'sieve-manage-mode 'mode-class 'special)