From 246fdb649de8be6b4123755c3c412e0c14c509b0 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 6 Jan 2005 07:58:40 +0000 Subject: [PATCH] Synch to No Gnus 200501060758. --- lisp/ChangeLog | 5 +++++ lisp/gnus-spec.el | 21 ++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d7f680a..e588d41 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-01-06 Katsumi Yamaoka + + * gnus-spec.el (gnus-update-format-specifications): Flush the + group format spec cache if it doesn't support decoded group names. + 2005-01-03 Reiner Steib * gnus-score.el (gnus-decay-scores, gnus-score-load-file): Allow diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el index 799134e..a497561 100644 --- a/lisp/gnus-spec.el +++ b/lisp/gnus-spec.el @@ -1,5 +1,5 @@ ;;; gnus-spec.el --- format spec functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -244,14 +244,17 @@ Return a list of updated types." 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)))) + ;; Flush the group format spec cache if there's the grouplens stuff + ;; or it doesn't support decoded group names. + (when (memq 'group types) + (let* ((spec (assq 'group gnus-format-specs)) + (sspec (gnus-prin1-to-string (nth 2 spec)))) + (when (or (string-match " gnus-tmp-grouplens[ )]" sspec) + (not (string-match " gnus-tmp-decoded-group[ )]" sspec))) + (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 (new-format type val unchanged updated) -- 1.7.10.4