Merge from gnus--devo--0

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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 91a1470227f0f4458bc9d1c7195c33bbe97f74d3..2edb93538b41c9876fac5c599eb561f9b902549a 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+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):

diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index e57b7d80c511024f1b1f8527b84141c347af3619..84c9d9f802d3ac9015c39eddce8ce4d34dae93f9 100644 (file)
--- a/lisp/gnus/nnir.el
+++ b/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)))