Mercurial > emacs
changeset 95830:4bbbc2594f0b
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1231
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 12 Jun 2008 02:43:05 +0000 |
| parents | bdb97d11d0f0 |
| children | c5f85ede892d |
| files | lisp/gnus/ChangeLog lisp/gnus/nnir.el |
| diffstat | 2 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Jun 11 22:40:06 2008 +0000 +++ b/lisp/gnus/ChangeLog Thu Jun 12 02:43:05 2008 +0000 @@ -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):
--- a/lisp/gnus/nnir.el Wed Jun 11 22:40:06 2008 +0000 +++ b/lisp/gnus/nnir.el Thu Jun 12 02:43:05 2008 +0000 @@ -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)))