Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1231

lisp/gnus/ChangeLog

+2008-06-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nnir.el: Require edmacro when compiling with XEmacs.
+	(nnir-run-find-grep): Don't use 3rd arg of `split-string' which is not
+	available in Emacs 21.
+
 2008-06-11  Glenn Morris  <rgm@gnu.org>
 
 	* gnus-util.el (x-focus-frame):

lisp/gnus/nnir.el

@@ -658,6 +658,11 @@ that it is for Namazu, not Wais."
            gnus-current-window-configuration)
      nil)))
 
+(eval-when-compile
+  (when (featurep 'xemacs)
+    ;; The `kbd' macro requires that the `read-kbd-macro' macro is available.
+    (require 'edmacro)))
+
 (defun nnir-group-mode-hook ()
   (define-key gnus-group-mode-map (kbd "G G")
     'gnus-group-make-nnir-group))
@@ -1512,13 +1517,18 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
 	   'call-process "find" nil t
 	   "find" group "-type" "f" "-name" "[0-9]*" "-exec"
 	   "grep"
-	   `("-l" ,@(and grep-options (split-string grep-options "\\s-" t))
+	   `("-l" ,@(and grep-options
+			 ;; Note: the 3rd arg of `split-string' is not
+			 ;; available in Emacs 21.
+			 (delete "" (split-string grep-options "\\s-")))
 	     "-e" ,regexp "{}" "+"))))
 
       ;; Translate relative paths to group names.
       (while (not (eobp))
-	(let* ((path (split-string
-		      (buffer-substring (point) (line-end-position)) "/" t))
+	(let* ((path (delete
+		      ""
+		      (split-string
+		       (buffer-substring (point) (line-end-position)) "/")))
 	       (art (string-to-number (car (last path)))))
 	  (while (string= "." (car path))
 	    (setq path (cdr path)))