From: yamaoka <yamaoka>
Date: Sun, 18 Jun 2000 22:10:32 +0000 (+0000)
Subject: Sync.
X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~24
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f822ba2007fbefacedccf7d537842db60f24dc5d;p=elisp%2Fgnus.git-

Sync.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 818d235..76592d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-17 18:58:46  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-sum.el (gnus-summary-local-variables): gnus-orphan-score is
+	a local variable.
+	* gnus-sum.el (gnus-orphan-score): Move here.
+
 2000-06-10 09:33:36  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
 	* message.el (message-forward): Remove show-mml condition.
diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 74f6aa4..f8bb43c 100644
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -139,12 +139,6 @@ will be expired along with non-matching score entries."
   :group 'gnus-score-expire
   :type 'boolean)
 
-(defcustom gnus-orphan-score nil
-  "*All orphans get this score added.  Set in the score file."
-  :group 'gnus-score-default
-  :type '(choice (const nil)
-		 integer))
-
 (defcustom gnus-decay-scores nil
   "*If non-nil, decay non-permanent scores."
   :group 'gnus-score-decay
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 9995d24..c243896 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -930,6 +930,12 @@ For example: ((1 . cn-gb-2312) (2 . big5))."
   :type 'function
   :group 'gnus-summary)
 
+(defcustom gnus-orphan-score nil
+  "*All orphans get this score added.  Set in the score file."
+  :group 'gnus-score-default
+  :type '(choice (const nil)
+		 integer))
+
 ;;; Internal variables
 
 (defvar gnus-article-mime-handles nil)
@@ -1156,6 +1162,7 @@ end position and text.")
     gnus-score-alist gnus-current-score-file
     (gnus-summary-expunge-below . global)
     (gnus-summary-mark-below . global)
+    (gnus-orphan-score . global)
     gnus-newsgroup-active gnus-scores-exclude-files
     gnus-newsgroup-history gnus-newsgroup-ancient
     gnus-newsgroup-sparse gnus-newsgroup-process-stack