[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/gnus ChangeLog nnir.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp/gnus ChangeLog nnir.el |
Date: |
Tue, 25 Aug 2009 07:03:50 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/08/25 07:03:50
Modified files:
lisp/gnus : ChangeLog nnir.el
Log message:
(top-level): Don't require cl at run-time.
(nnir-run-waissearch, nnir-run-swish-e, nnir-run-hyrex):
Replace cl-function substitute with gnus-replace-in-string.
(nnir-run-waissearch, nnir-run-swish++, nnir-run-swish-e)
(nnir-run-hyrex, nnir-run-namazu): Replace cl-function sort* with sort.
(nnir-run-find-grep): Replace cl-functions find-if and subseq with
simplified expansions.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.815&r2=1.816
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/nnir.el?cvsroot=emacs&r1=1.4&r2=1.5
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -b -r1.815 -r1.816
--- ChangeLog 22 Aug 2009 19:13:34 -0000 1.815
+++ ChangeLog 25 Aug 2009 07:03:49 -0000 1.816
@@ -1,3 +1,13 @@
+2009-08-25 Glenn Morris <address@hidden>
+
+ * nnir.el (top-level): Don't require cl at run-time.
+ (nnir-run-waissearch, nnir-run-swish-e, nnir-run-hyrex):
+ Replace cl-function substitute with gnus-replace-in-string.
+ (nnir-run-waissearch, nnir-run-swish++, nnir-run-swish-e)
+ (nnir-run-hyrex, nnir-run-namazu): Replace cl-function sort* with sort.
+ (nnir-run-find-grep): Replace cl-functions find-if and subseq with
+ simplified expansions.
+
2009-08-22 Glenn Morris <address@hidden>
* gnus-art.el (gnus-button-patch): Use forward-line rather than
Index: nnir.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/nnir.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- nnir.el 5 Jan 2009 03:22:12 -0000 1.4
+++ nnir.el 25 Aug 2009 07:03:50 -0000 1.5
@@ -336,7 +336,7 @@
(require 'gnus-sum)
(require 'message)
(require 'gnus-util)
-(eval-and-compile
+(eval-when-compile
(require 'cl))
(nnoo-declare nnir)
@@ -916,14 +916,15 @@
(unless (string-match prefix dirnam)
(nnheader-report 'nnir "Dir name %s doesn't contain prefix %s"
dirnam prefix))
- (setq group (substitute ?. ?/ (replace-match "" t t dirnam)))
+ (setq group (gnus-replace-in-string
+ (replace-match "" t t dirnam) "/" "."))
(push (vector (nnir-group-full-name group server)
(string-to-number artno)
(string-to-number score))
artlist))
(message "Massaging waissearch output...done")
(apply 'vector
- (sort* artlist
+ (sort artlist
(function (lambda (x y)
(> (nnir-artitem-rsv x)
(nnir-artitem-rsv y)))))))))
@@ -1235,7 +1236,7 @@
;; Sort by score
(apply 'vector
- (sort* artlist
+ (sort artlist
(function (lambda (x y)
(> (nnir-artitem-rsv x)
(nnir-artitem-rsv y)))))))))
@@ -1316,9 +1317,9 @@
;; eliminate all ".", "/", "\" from beginning. Always matches.
(string-match "^[./\\]*\\(.*\\)$" dirnam)
;; "/" -> "."
- (setq group (substitute ?. ?/ (match-string 1 dirnam)))
+ (setq group (gnus-replace-in-string (match-string 1 dirnam) "/"
"."))
;; Windows "\\" -> "."
- (setq group (substitute ?. ?\\ group))
+ (setq group (gnus-replace-in-string group "\\\\" "."))
(push (vector (nnir-group-full-name group server)
(string-to-number artno)
@@ -1329,7 +1330,7 @@
;; Sort by score
(apply 'vector
- (sort* artlist
+ (sort artlist
(function (lambda (x y)
(> (nnir-artitem-rsv x)
(nnir-artitem-rsv y)))))))))
@@ -1397,13 +1398,14 @@
score (match-string 3))
(when (string-match prefix dirnam)
(setq dirnam (replace-match "" t t dirnam)))
- (push (vector (nnir-group-full-name (substitute ?. ?/ dirnam) server)
+ (push (vector (nnir-group-full-name
+ (gnus-replace-in-string dirnam "/" ".") server)
(string-to-number artno)
(string-to-number score))
artlist))
(message "Massaging hyrex-search output...done.")
(apply 'vector
- (sort* artlist
+ (sort artlist
(function (lambda (x y)
(if (string-lessp (nnir-artitem-group x)
(nnir-artitem-group y))
@@ -1476,7 +1478,7 @@
;; sort artlist by score
(apply 'vector
- (sort* artlist
+ (sort artlist
(function (lambda (x y)
(> (nnir-artitem-rsv x)
(nnir-artitem-rsv y)))))))))
@@ -1505,11 +1507,14 @@
"."
;; Try accessing the group literally as well as
;; interpreting dots as directory separators so the
- ;; engine works with plain nnml as well as the Gnus
- ;; Cache.
- (find-if 'file-directory-p
+ ;; engine works with plain nnml as well as the Gnus Cache.
(let ((group (gnus-group-real-name group)))
- (list group (gnus-replace-in-string group "\\." "/" t)))))))
+ ;; Replace cl-func find-if.
+ (if (file-directory-p group)
+ group
+ (if (file-directory-p
+ (setq group (gnus-replace-in-string group "\\." "/"
t)))
+ group))))))
(unless group
(error "Cannot locate directory for group"))
(save-excursion
@@ -1532,7 +1537,14 @@
(art (string-to-number (car (last path)))))
(while (string= "." (car path))
(setq path (cdr path)))
- (let ((group (mapconcat 'identity (subseq path 0 -1) ".")))
+ (let ((group (mapconcat 'identity
+ ;; Replace cl-func: (subseq path 0 -1)
+ (let ((end (1- (length path)))
+ res)
+ (while (>= (setq end (1- end)) 0)
+ (push (pop path) res))
+ (nreverse res))
+ ".")))
(push (vector (nnir-group-full-name group server) art 0)
artlist))
(forward-line 1)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp/gnus ChangeLog nnir.el,
Glenn Morris <=