[Emacs-diffs] Changes to emacs/lisp/gnus/nnir.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/06/12 02:43:05

Index: nnir.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/nnir.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- nnir.el     7 Jun 2008 02:35:44 -0000       1.2
+++ nnir.el     12 Jun 2008 02:43:05 -0000      1.3
@@ -658,6 +658,11 @@
            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 @@
           '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)))