Synch with latest snapshot of Oort Gnus (the CVS server is currently down).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea2a774..b8c0ad9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-11  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus.el (gnus-article-unpropagated-mark-lists): Don't propagate
+       bookmark, because update-mark doesn't handle it correctly.
+
 2002-02-09  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-soup.el (gnus-soup-send-packet): Send news and mail

diff --git a/lisp/gnus-soup.el b/lisp/gnus-soup.el
index 10bb7ef..1461b33 100644 (file)
--- a/lisp/gnus-soup.el
+++ b/lisp/gnus-soup.el
@@ -1,6 +1,6 @@
 ;;; gnus-soup.el --- SOUP packet writing support for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@iesd.auc.dk>

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 9cec1de..86cc938 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1191,7 +1191,7 @@ variable instead."
 This is a list where each element is a complete select method (see
 `gnus-select-method').
 
-If, for instance, you want to read your mail with the nnml backend,
+If, for instance, you want to read your mail with the nnml back end,
 you could set this variable:
 
 \(setq gnus-secondary-select-methods '((nnml \"\")))"
@@ -1841,7 +1841,7 @@ Putting (gnus-agentize) in ~/.gnus is obsolete by (setq gnus-agent t)."
 (defvar gnus-agent-covered-methods nil)
 
 (defvar gnus-command-method nil
-  "Dynamically bound variable that says what the current backend is.")
+  "Dynamically bound variable that says what the current back end is.")
 
 (defvar gnus-current-select-method nil
   "The current method for selecting a newsgroup.")
@@ -1902,12 +1902,13 @@ Putting (gnus-agentize) in ~/.gnus is obsolete by (setq gnus-agent t)."
 ;; `download' is a agent flag private to each gnus installation
 ;; `unsend' are for nndraft groups only
 ;; `score' is not a proper mark
+;; `bookmark': don't propagated it, or fix the bug in update-mark.
 (defconst gnus-article-unpropagated-mark-lists
-  '(seen cache download unsend score)
-  "Marks that shouldn't be propagated to backends.
-Typical marks are those that make no sense in a standalone backend,
+  '(seen cache download unsend score bookmark)
+  "Marks that shouldn't be propagated to back ends.
+Typical marks are those that make no sense in a standalone back end,
 such as a mark that says whether an article is stored in the cache
-\(which doesn't make sense in a standalone backend).")
+\(which doesn't make sense in a standalone back end).")
 
 (defvar gnus-headers-retrieved-by nil)
 (defvar gnus-article-reply nil)