Synch to No Gnus 200401271208.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9dfa72a..05ee898 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2004-01-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.el (gnus-tmp-grouplens): Remove.
+       (gnus-summary-line-format): Remove grouplens.
+
+       * gnus-group.el (gnus-group-line-format): Ditto.
+
+       * gnus-spec.el (gnus-format-specs): Ditto.
+       (gnus-update-format-specifications): Flush the group format spec
+       cache if there's the grouplens stuff.
+       (gnus-parse-simple-format): Replace %l with the empty string.
+
 2004-01-27  Steve Youngs  <sryoungs@bigpond.net.au>
 
        * gnus-spec.el (gnus-parse-simple-format): Fix setq value

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index e06fcb8..51d72c5 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -145,7 +145,7 @@ list."
                         (function-item gnus-group-sort-by-rank)
                         (function :tag "other" nil))))
 
-(defcustom gnus-group-line-format "%M\%S\%p\%P\%5y:%B%(%g%)%l %O\n"
+(defcustom gnus-group-line-format "%M\%S\%p\%P\%5y:%B%(%g%)%O\n"
   "*Format of group lines.
 It works along the same lines as a normal formatting string,
 with some simple extensions.
@@ -174,7 +174,6 @@ with some simple extensions.
 %P    Topic indentation (string)
 %m    Whether there is new(ish) mail in the group (char, \"%\")
 %w    Number of new(ish) mails in the group (integer)
-%l    Whether there are GroupLens predictions for this group (string)
 %n    Select from where (string)
 %z    A string that look like `<%s:%n>' if a foreign select method is used
 %d    The date the group was last entered.

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 435c020..25d67fb 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -136,7 +136,7 @@ text properties. This is only needed on XEmacs, as FSF Emacs does this anyway."
   (gnus-byte-code 'gnus-group-line-format-spec))
 
 (defvar gnus-format-specs
-  `((group ("%M\%S\%p\%P\%5y: %(%g%)%l\n" ,gnus-group-line-format-spec))
+  `((group ("%M\%S\%p\%P\%5y: %(%g%)\n" ,gnus-group-line-format-spec))
     (summary-dummy ("*  %(:                          :%) %S\n"
                    ,gnus-summary-dummy-line-format-spec))
     (summary ("%U%R%z%I%(%[%4L: %-23,23f%]%) %s\n"
@@ -234,6 +234,14 @@ text properties. This is only needed on XEmacs, as FSF Emacs does this anyway."
          gnus-format-specs-compiled nil)
     (gnus-product-variable-touch 'gnus-format-specs
                                 'gnus-format-specs-compiled))
+  ;; Flush the group format spec cache if there's the grouplens stuff.
+  (let ((spec (assq 'group gnus-format-specs)))
+    (when (and (memq 'group types)
+              (string-match " gnus-tmp-grouplens[ )]"
+                            (gnus-prin1-to-string (cdr spec))))
+      (setq gnus-format-specs (delq spec gnus-format-specs)
+           spec (assq 'group gnus-format-specs-compiled)
+           gnus-format-specs-compiled (delq spec gnus-format-specs-compiled))))
 
   ;; Go through all the formats and see whether they need updating.
   (let (type val)
@@ -646,6 +654,9 @@ are supported for %s."
                   ?s)))
           ;; Find the specification from `spec-alist'.
           ((setq elem (cdr (assq (or extended-spec spec) spec-alist))))
+          ;; We used to use "%l" for displaying the grouplens score.
+          ((eq spec ?l)
+           (setq elem '("" ?s)))
           (t
            (setq elem '("*" ?s))))
          (setq elem-type (cadr elem))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 7729263..63823ce 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -40,9 +40,6 @@
 
 (require 'gnus-vers)
 
-;; For backward compatibility with old .newsrc.eld files.
-(defvar gnus-tmp-grouplens "")  
-
 (defgroup gnus nil
   "The coffee-brewing, all singing, all dancing, kitchen sink newsreader."
   :group 'news
@@ -2884,7 +2881,6 @@ with some simple extensions.
 %z   Article zcore (character)
 %t   Number of articles under the current thread (number).
 %e   Whether the thread is empty or not (character).
-%l   GroupLens score (string).
 %V   Total thread score (number).
 %P   The line number (number).
 %O   Download mark (character).