* lisp/nnir.el (top): Don't call `nnir-group-mode-hook' in T-gnus.

* lisp/gnus-group.el (gnus-group-group-map): Define "G" as
`gnus-group-make-nnir-group', and define "S" as
`gnus-group-make-shimbun-group'.

* lisp/gnus.el (top): Add autoload of
`gnus-group-make-nnir-group'.

diff --git a/ChangeLog b/ChangeLog
index 9941366..4c25cca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
-2001-09-04  KOSEKI Yoshinori  <kose@wizard.tamra.co.jp>
+2001-09-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
-       * lisp/nnir.el: Add namazu support.
+       * lisp/nnir.el (top): Don't call `nnir-group-mode-hook' in T-gnus.
 
-2001-09-04  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+       * lisp/gnus-group.el (gnus-group-group-map): Define "G" as
+       `gnus-group-make-nnir-group', and define "S" as
+       `gnus-group-make-shimbun-group'.
+
+       * lisp/gnus.el (top): Add autoload of
+       `gnus-group-make-nnir-group'.
 
        * lisp/nnir.el: Import from
        ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/emacs/nnir.el.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 1b9fc0b..90b47eb 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -613,6 +613,8 @@ simple manner.")
     "V" gnus-group-make-empty-virtual
     "D" gnus-group-enter-directory
     "f" gnus-group-make-doc-group
+    "G" gnus-group-make-nnir-group
+    "S" gnus-group-make-shimbun-group
     "w" gnus-group-make-web-group
     "r" gnus-group-rename-group
     "c" gnus-group-customize

diff --git a/lisp/gnus.el b/lisp/gnus.el
index cf8255a..f77485b 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2170,6 +2170,9 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
             (subrp (symbol-function 'base64-encode-string)))
   (require 'base64))
 
+;; To make nnir groups.
+(autoload 'gnus-group-make-nnir-group "nnir" nil t)
+
 ;; To make shimbun groups.
 (autoload 'gnus-group-make-shimbun-group "nnshimbun" nil t)
 

diff --git a/lisp/nnir.el b/lisp/nnir.el
index acbf13b..e71e706 100644 (file)
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -608,7 +608,10 @@ that it is for Namazu, not Glimpse."
         (kbd "G G")
       "GG")                             ; XEmacs 19 compat
     'gnus-group-make-nnir-group))
-(add-hook 'gnus-group-mode-hook 'nnir-group-mode-hook)
+(add-hook 'gnus-group-mode-hook
+         (lambda ()
+           (unless (string-ma "T-gnus" gnus-version)
+             (nnir-group-mode-hook))))
 
 
 
@@ -1214,7 +1217,9 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
               (progn
                 (message "%s args: %s" nnir-namazu-program
                          (mapconcat 'identity (cddddr cp-list) " "))
-                (apply 'call-process cp-list))))
+               (let ((process-environement process-environment))
+                 (setenv "LANG" "C")
+                 (apply 'call-process cp-list)))))
         (unless (or (null exitstatus)
                     (zerop exitstatus))
           (nnheader-report 'nnir "Couldn't run namazu: %s" exitstatus)