Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5b0d63..c9ef545 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2000-09-20 17:37:46  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-default-charset): Set default value in
+       non-MULE XEmacsen as iso-8859-1.
+
+2000-09-20 12:02:24  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-demon.el: Use (featurep 'xemacs).
+       * gnus-agent.el: timer vs. itimer.
+       * mail-source.el: Ditto.
+
 2000-09-19 10:24:57  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-group.el (gnus-group-make-kiboze-group): Makedir.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index ad2c19a..4924a29 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -32,7 +32,9 @@
 (require 'nnvirtual)
 (require 'gnus-sum)
 (eval-when-compile
-  (require 'timer)
+  (if (featurep 'xemacs)
+      (require 'itimer)
+    (require 'timer))
   (require 'gnus-score)
   (require 'gnus-group))
 

diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index 78d7286..40d6d06 100644 (file)
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -34,7 +34,7 @@
 (require 'nnmail)
 (require 'gnus-util)
 (eval-and-compile
-  (if (string-match "XEmacs" (emacs-version))
+  (if (featurep 'xemacs)
       (require 'itimer)
     (require 'timer)))
 

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 0680a37..42ee683 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -696,7 +696,10 @@ If ARGS, PROMPT is used as an argument to `format'."
 (defvar mail-source-report-new-mail-timer nil)
 (defvar mail-source-report-new-mail-idle-timer nil)
 
-(eval-when-compile (require 'timer))
+(eval-when-compile 
+  (if (featurep 'xemacs)
+      (require 'itimer)
+    (require 'timer)))
 
 (defun mail-source-start-idle-timer ()
   ;; Start our idle timer if necessary, so we delay the check until the

diff --git a/lisp/message.el b/lisp/message.el
index 42d9085..7c0519c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -847,7 +847,8 @@ Valid valued are `unique' and `unsent'."
   :type '(choice (const :tag "unique" unique)
                 (const :tag "unsent" unsent)))
 
-(defcustom message-default-charset nil
+(defcustom message-default-charset 
+  (and (featurep 'xemacs) (not (featurep 'mule)) 'iso-8859-1)
   "Default charset used in non-MULE XEmacsen."
   :group 'message
   :type 'symbol)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 48d73ec..a187a34 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-20  Simon Josefsson  <simon@josefsson.org>
+
+       * gnus.texi (IMAP): Add examples.
+
 2000-09-19  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus.texi (IMAP): Add pointer to description of ~/.authinfo file

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 5ce5d07..98548d9 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -13029,6 +13029,13 @@ IMAP \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C
 \e$B@\B3$r;n$_$k%5!<%P!<$N%]!<%H$G$9!#=i4|CM$G$O!"%]!<%H\e(B 143 \e$B$+!"\e(BSSL \e$B$G\e(B
 \e$B$O\e(B 993 \e$B$G$9!#\e(B
 
+\e$B$3$l$O@0?t$G$J$1$l$P$J$j$^$;$s!#0J2<$O%5!<%P!<;XDj$NNc$G$9!#\e(B
+
+@lisp
+(nnimap "mail.server.com"
+        (nnimap-server-port 4711))
+@end lisp
+
 @item nnimap-list-pattern
 @vindex nnimap-list-pattern
 \e$B;HMQ2DG=$J%a!<%k%\%C%/%9$r@)8B$9$k$?$a$NJ8;zNs$+%j%9%H$G$9!#$3$l$O!"%5!<\e(B
@@ -13041,10 +13048,12 @@ IMAP \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C
 \e$B$N\e(B REFERENCE \e$B$,;HMQ$5$l$k$+$O%5!<%P!<FCM-$G$9$,!"%o%7%s%H%sBg3X$N%5!<%P!<\e(B
 \e$B$G$O!"%a!<%k%\%C%/%9$HO"7k$5$l$?%G%#%l%/%H%j!<$G$9!#\e(B
 
-\e$BNc$($P\e(B:
+\e$B0J2<$O%5!<%P!<;XDj$NNc$G$9!#\e(B
 
 @lisp
-("INBOX" "Mail/*" "alt.sex.*" ("~friend/Mail/" . "list/*"))
+(nnimap "mail.server.com"
+        (nnimap-list-pattern ("INBOX" "Mail/*" "alt.sex.*" 
+                               ("~friend/Mail/" . "list/*"))))
 @end lisp
 
 @item nnimap-stream
@@ -13054,6 +13063,16 @@ IMAP \e$B$O%a!<%k\e(B (\e$B$b$7$/$O!"%K%e!<%9!"$b$7$/$O\e(B ...) \e$B$rFI$`$?$a$N%M%C
 (SSL \e$B$O\e(B STARTTLS \e$B$GCV$-49$($i$l$F$$$^$9!#$3$l$O<+F08!=P$G$-$^$9$,!"$^$@\e(B
 \e$B9-HO0O$KG[Hw$5$l$F$$$^$;$s!#\e(B)
 
+\e$B0J2<$O%5!<%P!<;XDj$NNc$G$9!#\e(B
+
+@lisp
+(nnimap "mail.server.com"
+        (nnimap-stream ssl))
+@end lisp
+
+@code{nnimap-stream} \e$B$NCM$O%7%s%\%k$G$J$1$l$P$J$i$J$$$3$H$KCm0U$7$F2<$5\e(B
+\e$B$$\e(B!
+
 @itemize @bullet
 @item
 @dfn{gssapi:} GSSAPI (\e$BIaDL$O\e(B kerberos 5) \e$B$r;H$$$^$9!#\e(B@samp{imtest} \e$B%W%m\e(B
@@ -13098,6 +13117,16 @@ IMAP \e$B@\B3$K\e(B @code{shell} \e$B%9%H%j!<%`$r;H$&>l9g!"JQ\e(B
 \e$B%5!<%P!<$K@\B3$9$k$?$a$K;H$o$l$kG'>Z$G$9!#=i4|@_Dj$G$O!"\e(Bnnimap \e$B$O%5!<%P!<\e(B
 \e$B$,;HMQ2DG=$J0lHV0BA4$JG'>Z$r;HMQ$7$^$9!#\e(B
 
+\e$B0J2<$O%5!<%P!<;XDj$NNc$G$9!#\e(B
+
+@lisp
+(nnimap "mail.server.com"
+        (nnimap-authenticator anonymous))
+@end lisp
+
+@code{nnimap-authenticator} \e$B$NCM$O%7%s%\%k$G$J$1$l$P$J$i$J$$$3$H$KCm0U$7\e(B
+\e$B$F2<$5$$\e(B!
+
 @itemize @bullet
 @item
 @dfn{gssapi:} GSSAPI (\e$BIaDL$O\e(B kerberos 5) \e$BG'>Z$G$9!#30It%W%m%0%i\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index e40820b..9909aa6 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -13598,6 +13598,13 @@ server name if not specified.
 @vindex nnimap-server-port
 Port on server to contact.  Defaults to port 143, or 993 for SSL.
 
+Note that this should be a integer, example server specification:
+
+@lisp
+(nnimap "mail.server.com"
+        (nnimap-server-port 4711))
+@end lisp
+
 @item nnimap-list-pattern
 @vindex nnimap-list-pattern
 String or list of strings of mailboxes to limit available groups to.
@@ -13611,10 +13618,12 @@ REFERENCE is used for is server specific, but on the University of
 Washington server it's a directory that will be concatenated with the
 mailbox.
 
-Example:
+Example server specification:
 
 @lisp
-("INBOX" "Mail/*" "alt.sex.*" ("~friend/Mail/" . "list/*"))
+(nnimap "mail.server.com"
+        (nnimap-list-pattern ("INBOX" "Mail/*" "alt.sex.*" 
+                               ("~friend/Mail/" . "list/*"))))
 @end lisp
 
 @item nnimap-stream
@@ -13624,6 +13633,15 @@ will detect and automatically use all of the below, with the exception
 of SSL. (SSL is being replaced by STARTTLS, which can be automatically
 detected, but it's not widely deployed yet).
 
+Example server specification:
+
+@lisp
+(nnimap "mail.server.com"
+        (nnimap-stream ssl))
+@end lisp
+
+Please note that the value of @code{nnimap-stream} is a symbol!
+
 @itemize @bullet
 @item
 @dfn{gssapi:} Connect with GSSAPI (usually kerberos 5). Require the
@@ -13669,6 +13687,15 @@ For IMAP connections using the @code{shell} stream, the variable
 The authenticator used to connect to the server.  By default, nnimap
 will use the most secure authenticator your server is capable of.
 
+Example server specification:
+
+@lisp
+(nnimap "mail.server.com"
+        (nnimap-authenticator anonymous))
+@end lisp
+
+Please note that the value of @code{nnimap-authenticator} is a symbol!
+
 @itemize @bullet
 @item
 @dfn{gssapi:} GSSAPI (usually kerberos 5) authentication. Require