Synch with Gnus.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index da72e83..f32980b 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-14 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gpg.el (gpg-passphrase-store): Don't activate timer if it is live.
+
 2000-11-30 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gpg.el: (gpg-make-temp-file): Use expand-file-name.
@@ -8,7 +12,7 @@
        (gpg-with-temp-files): Ditto.
        (gpg-show-result): Ditto.
 
-2000-11-08  Bj\e,Av\e(Brn Torkelsson  <torkel@hpc2n.umu.se>
+2000-11-08  Bj\e-Aörn Torkelsson  <torkel@hpc2n.umu.se>\e$)A
 
        * gpg.el: In Xemacs it is called point-at-eol, not
        line-end-position

diff --git a/contrib/gpg.el b/contrib/gpg.el
index f2dbbe8..523728c 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -796,10 +796,12 @@ Updates the timeout for clearing the cache to `gpg-passphrase-timeout'."
                    (timer-relative-time (current-time) 
                                         gpg-passphrase-timeout))
     (timer-set-function gpg-passphrase-timer 'gpg-passphrase-forget)
-    (timer-activate gpg-passphrase-timer)
+    (unless (and (fboundp 'itimer-live-p)
+                (itimer-live-p gpg-passphrase-timer))
+      (timer-activate gpg-passphrase-timer))
     (setq gpg-passphrase passphrase))
   passphrase)
-  
+
 (defun gpg-passphrase-read ()
   "Read a passphrase and remember it for some time."
   (interactive)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 55a8ed0..c7ea637 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-14 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-util.el (mm-charset-synonym-alist): Add cn-gb.
+
+2000-12-13 21:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnspool.el (nnspool-lib-dir): Check whether /usr/lib/news/active
+       exists.
+
 2000-12-13 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-msg.el (gnus-post-method): Use backend name when the

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 035ccf0..a1a9de7 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -139,6 +139,7 @@
 (defvar mm-charset-synonym-alist
   '((big5 . cn-big5)
     (gb2312 . cn-gb-2312)
+    (cn-gb . cn-gb-2312)
     (x-ctext . ctext))
   "A mapping from invalid charset names to the real charset names.")
 

diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index b4c7cd8..f17c141 100644 (file)
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -49,7 +49,10 @@ If you are using Cnews, you probably should set this variable to nil.")
 (defvoo nnspool-nov-directory (concat nnspool-spool-directory "over.view/")
   "Local news nov directory.")
 
-(defvoo nnspool-lib-dir "/usr/lib/news/"
+(defvoo nnspool-lib-dir 
+    (if (file-exists-p "/usr/lib/news/active")
+       "/usr/lib/news/"
+      "/var/lib/news/")
   "Where the local news library files are stored.")
 
 (defvoo nnspool-active-file (concat nnspool-lib-dir "active")