Changes committed gnus/lisp (ChangeLog nnir.el)

Modified: ChangeLog 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.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1874 gnus/lisp/ChangeLog:7.1875
--- ChangeLog:7.1874	Wed Jun 11 16:19:44 2008
+++ ChangeLog	Thu Jun 12 01:12:55 2008
@@ -1,3 +1,9 @@
+2008-06-11  Katsumi Yamaoka  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* gnus-util.el (x-focus-frame):
Index: nnir.el
diff -u gnus/lisp/nnir.el:7.3 gnus/lisp/nnir.el:7.4
--- nnir.el:7.3	Wed Jun 11 16:19:44 2008
+++ nnir.el	Thu Jun 12 01:12:55 2008
@@ -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)))