Install the same change on `t-gnus-6_15' branch.

diff --git a/ChangeLog b/ChangeLog
index e01a8ab..50c332f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+       * lisp/gnus-namazu.el (gnus-namazu-summary-buffer-name): Changed
+       the expression to decide whether `gnus-summary-buffer-name' should
+       be advised.
+       (gnus-namazu/setup): Strict checking the other Gnus variants than
+       Oort-Gnus before handling `gnus-group-name-charset-group-alist'.
+
 2001-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/nnheader.el (mm-multibyte-string-p): Alias to

diff --git a/lisp/gnus-namazu.el b/lisp/gnus-namazu.el
index 37fdd86..e0e3eb8 100644 (file)
--- a/lisp/gnus-namazu.el
+++ b/lisp/gnus-namazu.el
@@ -149,20 +149,18 @@ options make any sense in this context."
 (defconst gnus-namazu/group-name-regexp "\\`nnvirtual:namazu-search\\?")
 
 ;; Multibyte group name:
-(add-to-list 'gnus-group-name-charset-group-alist
-            (cons gnus-namazu/group-name-regexp gnus-namazu-coding-system))
 (and
  (fboundp 'gnus-group-decoded-name)
- (let ((group
-       (concat "nnvirtual:namazu-search?query="
-               (decode-coding-string
-                (string 27 36 66 52 65 59 122 27 40 66)
-                (if (boundp 'MULE) '*iso-2022-jp* 'iso-2022-7bit)))))
-   (/= (length (string-to-char-list (concat "*Summary " group "*")))
-       (length
-       (string-to-char-list
-        (gnus-summary-buffer-name
-         (encode-coding-string group gnus-namazu-coding-system))))))
+ (let ((gnus-group-name-charset-group-alist
+       (list (cons gnus-namazu/group-name-regexp gnus-namazu-coding-system)))
+       (query (decode-coding-string
+              (string 27 36 66 52 65 59 122 27 40 66)
+              (if (boundp 'MULE) '*iso-2022-jp* 'iso-2022-7bit))))
+   (not (string-match query
+                     (gnus-summary-buffer-name
+                      (encode-coding-string
+                       (concat "nnvirtual:namazu-search?query=" query)
+                       gnus-namazu-coding-system)))))
  (let (current-load-list)
    (defadvice gnus-summary-buffer-name
      (before gnus-namazu-summary-buffer-name activate compile)
@@ -181,6 +179,17 @@ options make any sense in this context."
    (gnus-servers-using-backend 'nnmh)))
 
 (defun gnus-namazu/setup ()
+  (and (boundp 'gnus-group-name-charset-group-alist)
+       (not (member (cons gnus-namazu/group-name-regexp
+                         gnus-namazu-coding-system)
+                   gnus-group-name-charset-group-alist))
+       (let ((pair (assoc gnus-namazu/group-name-regexp
+                         gnus-group-name-charset-group-alist)))
+        (if pair
+            (setcdr pair gnus-namazu-coding-system)
+          (push (cons gnus-namazu/group-name-regexp
+                      gnus-namazu-coding-system)
+                gnus-group-name-charset-group-alist))))
   (unless gnus-namazu-case-sensitive-filesystem
     ;; FIXME: The alist to map group names in lower case to real names
     ;; is reconstructed every when gnus-namazu/setup() is called.