X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnir.el;h=846db89de1fe6748b1f8654f1d0eb939322da1c4;hb=9b741e050b400987d68ff761c6cc3276c932839c;hp=b188fbbfb47b237b52f8cdb44ede342dee24a3a7;hpb=03787a6e3a544d2afafd0df5ba3408f6b6c1fdf2;p=elisp%2Fgnus.git-

diff --git a/lisp/nnir.el b/lisp/nnir.el
index b188fbb..846db89 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -1,8 +1,6 @@
 ;;; nnir.el --- search mail with various search engines
 ;; Copyright (C) 1998 Kai Großjohann
 
-;; $Id: nnir.el,v 1.72 2001/08/17 11:15:13 grossjoh Exp $
-
 ;; Author: Kai Großjohann <grossjohann@ls6.cs.uni-dortmund.de>
 ;; Keywords: news, mail, searching, ir, glimpse, wais
 
@@ -287,7 +285,7 @@
 
 ;;; Setup Code:
 
-(defconst nnir-version "$Id: nnir.el,v 1.72 2001/08/17 11:15:13 grossjoh Exp $"
+(defconst nnir-version "1.72"
   "Version of NNIR.")
 
 (require 'cl)
@@ -463,7 +461,7 @@ that it is for EWS, not Glimpse."
 
 (defcustom nnir-imap-default-charset nil
   "*Name of the charset of the strings that appear in the search criteria."
-  :type '(choice (const nil) string)
+  :type '(choice (const nil) symbol)
   :group 'nnir)
 
 ;; Swish++.  Next three variables Copyright (C) 2000, 2001 Christoph
@@ -1242,11 +1240,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
              (exitstatus
 	      (let ((process-environment (copy-sequence process-environment)))
 		;; Disable locale.
-		(dolist (env process-environment)
-		  (when (string-match "\
-\\`\\(L\\(ANG\\|C_\\(ALL\\|CTYPE\\|COLLATE\\|TIME\\|NUMERIC\\|MONETARY\\|MESSAGES\\)\\)\\)=" env)
-		    (setenv (match-string 1 env) nil)))
-		(setenv "LANG" "C")
+		(setenv "LC_ALL" "C")
                 (message "%s args: %s" nnir-namazu-program
                          (mapconcat 'identity (cddddr cp-list) " "))
 		(apply 'call-process cp-list))))