Synch to No Gnus 200402240748.

[elisp/gnus.git-] / lisp / gnus-namazu.el

diff --git a/lisp/gnus-namazu.el b/lisp/gnus-namazu.el
index ee43a56..d33afb6 100644 (file)
--- a/lisp/gnus-namazu.el
+++ b/lisp/gnus-namazu.el
@@ -1,6 +1,7 @@
 ;;; gnus-namazu.el --- Search mail with Namazu -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2000,2001,2002,2003 TSUCHIYA Masatoshi <tsuchiya@namazu.org>
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004
+;; TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 
 ;; Author: TSUCHIYA Masatoshi <tsuchiya@namazu.org>
 ;; Keywords: mail searching namazu
@@ -101,10 +102,6 @@
 (require 'nnmail)
 (require 'gnus-sum)
 
-;; It is required for Mule 2.3.  See the file Mule23@1934.en.
-(eval-and-compile
-  (autoload 'regexp-opt "regexp-opt"))
-
 ;; To suppress byte-compile warning.
 (eval-when-compile
   (defvar nnml-directory)
@@ -164,10 +161,9 @@ options make any sense in this context."
 (defcustom gnus-namazu-make-index-arguments
   (nconc
    (list "--all" "--mailnews" "--deny=^.*[^0-9].*$")
-   (when (or (and (boundp 'current-language-environment)
-                 (string= "Japanese"
-                          (symbol-value 'current-language-environment)))
-            (boundp 'MULE))
+   (when (and (boundp 'current-language-environment)
+             (string= "Japanese"
+                      (symbol-value 'current-language-environment)))
      (list "--indexing-lang=ja")))
   "*Arguments of the indexer of Namazu."
   :type '(repeat string)
@@ -181,8 +177,8 @@ options make any sense in this context."
 
 (defcustom gnus-namazu-coding-system
   (if (memq system-type '(windows-nt OS/2 emx))
-      (if (boundp 'MULE) '*sjis* 'shift_jis)
-    (if (boundp 'MULE) '*euc-japan* 'euc-japan))
+      'shift_jis
+    'euc-japan)
   "*Coding system for Namazu process."
   :type 'coding-system
   :group 'gnus-namazu)
@@ -223,9 +219,8 @@ options make any sense in this context."
  (fboundp 'gnus-group-decoded-name)
  (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))))
+       (query (decode-coding-string (string 27 36 66 52 65 59 122 27 40 66)
+                                   'iso-2022-7bit)))
    (not (string-match query
                      (gnus-summary-buffer-name
                       (encode-coding-string
@@ -289,20 +284,17 @@ options make any sense in this context."
                  (replace-match "\\1:/"))
            (eq ?~ (char-after (point))))
       (insert (expand-file-name
-              (buffer-substring (gnus-point-at-bol) (gnus-point-at-eol))))
-      (delete-region (point) (gnus-point-at-eol)))
+              (buffer-substring (point-at-bol) (point-at-eol))))
+      (delete-region (point) (point-at-eol)))
     (forward-line 1)))
 
 (defsubst gnus-namazu/call-namazu (query)
   (let ((coding-system-for-read gnus-namazu-coding-system)
        (coding-system-for-write gnus-namazu-coding-system)
-       (input-coding-system gnus-namazu-coding-system)
-       (output-coding-system gnus-namazu-coding-system)
        (default-process-coding-system
          (cons gnus-namazu-coding-system gnus-namazu-coding-system))
        program-coding-system-alist
-       (file-name-coding-system gnus-namazu-coding-system)
-       (pathname-coding-system gnus-namazu-coding-system))
+       (file-name-coding-system gnus-namazu-coding-system))
     (apply 'call-process
           `(,gnus-namazu-command
             nil                        ; input from /dev/null
@@ -381,7 +373,7 @@ options make any sense in this context."
                    group
                    (string-to-number
                     (buffer-substring-no-properties (point)
-                                                    (gnus-point-at-eol))))
+                                                    (point-at-eol))))
                   articles))
        (forward-line 1))
       (nreverse articles))))