From: Adrian Aichner <adrian@xemacs.org>
Subject: [ping ding] Re: [S] [PATCH] gnus: New variable nnir-swish-e-index-files to support multiple index files and typo fixes
Date: Sun, 04 Dec 2005 23:56:58 +0100 [thread overview]
Message-ID: <1x0s4gjp.fsf@smtprelay.t-online.de> (raw)
In-Reply-To: <acfnnm1a.fsf@smtprelay.t-online.de> (Adrian Aichner's message of "Tue, 29 Nov 2005 23:09:53 +0100")
Adrian Aichner <adrian@xemacs.org> writes:
> SUPERSEDES <4q68mmwb.fsf@smtprelay.t-online.de>
>
> Hi All,
>
> this patch addresses feedback from Reiner.
Hello ding and Reiner, are there any issues with this superseding
patch?
Best regards,
Adrian
>
> I hope obsoleting nnir-swish-e-index-file is acceptable at this point,
> espacially since nnir-swish-e-index-files is initialized from the
> former for backward-compatibility.
>
> The motivation for this patch is the forbidding cost of merging tiny
> incremental swish-e index files will my hefty initial full index,
> measuring 878318KB.
>
> Seems like using multiple index files, as supported by swish-e's -f
> switch is the obvious way out.
>
> I have successfully tested this patch with
> emacs-version "21.5 (beta23) \"daikon\" (+CVS-20051031) XEmacs Lucid"
> gnus-version "Gnus v5.10.7"
> in a native windows build today.
>
> Would be great if this patch could be considered.
>
> I'm willing to make some adjustments, if necessary.
>
> In particular I tested index files in directories containing spaces,
> and it works fine.
>
> Best regards,
>
> Adrian
> gnus ChangeLog patch:
> Diff command: cvs -q diff -U 0
> Files affected: texi/ChangeLog lisp/ChangeLog contrib/ChangeLog
>
> Index: texi/ChangeLog
> ===================================================================
> RCS file: /usr/local/cvsroot/gnus/texi/ChangeLog,v
> retrieving revision 7.209
> diff -u -U0 -r7.209 ChangeLog
> --- texi/ChangeLog 29 Nov 2005 01:38:40 -0000 7.209
> +++ texi/ChangeLog 29 Nov 2005 22:09:27 -0000
> @@ -0,0 +1,4 @@
> +2005-11-29 Adrian Aichner <adrian@xemacs.org>
> +
> + * gnus.texi (Mail Source Specifiers): Typo fix.
> +
> Index: lisp/ChangeLog
> ===================================================================
> RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v
> retrieving revision 7.906
> diff -u -U0 -r7.906 ChangeLog
> --- lisp/ChangeLog 26 Nov 2005 18:57:27 -0000 7.906
> +++ lisp/ChangeLog 29 Nov 2005 22:09:30 -0000
> @@ -0,0 +1,4 @@
> +2005-11-29 Adrian Aichner <adrian@xemacs.org>
> +
> + * gnus-sum.el (gnus-summary-goto-subject): Typo fix.
> +
> Index: contrib/ChangeLog
> ===================================================================
> RCS file: /usr/local/cvsroot/gnus/contrib/ChangeLog,v
> retrieving revision 7.19
> diff -u -U0 -r7.19 ChangeLog
> --- contrib/ChangeLog 17 May 2005 08:02:03 -0000 7.19
> +++ contrib/ChangeLog 29 Nov 2005 22:09:30 -0000
> @@ -0,0 +1,8 @@
> +2005-11-29 Adrian Aichner <adrian@xemacs.org>
> +
> + * nnir.el: New variable nnir-swish-e-index-files to support
> + multiple swish-e index files.
> + * nnir.el (nnir-swish-e-index-file): Make obsolete.
> + * nnir.el (nnir-swish-e-index-files): New.
> + * nnir.el (nnir-run-swish-e): Use nnir-swish-e-index-files.
> +
>
> gnus source patch:
> Diff command: cvs -f -z3 -q diff -u -w -N
> Files affected: texi/gnus.texi lisp/gnus-sum.el contrib/nnir.el
>
> Index: contrib/nnir.el
> ===================================================================
> RCS file: /usr/local/cvsroot/gnus/contrib/nnir.el,v
> retrieving revision 7.8
> diff -u -w -r7.8 nnir.el
> --- contrib/nnir.el 6 Jul 2005 06:42:01 -0000 7.8
> +++ contrib/nnir.el 29 Nov 2005 22:00:39 -0000
> @@ -537,13 +537,23 @@
> ;; URL: http://sunsite.berkeley.edu/SWISH-E/
> ;; New version: http://www.boe.es/swish-e
>
> +(make-obsolete-variable 'nnir-swish-e-index-file 'nnir-swish-e-index-files)
> (defcustom nnir-swish-e-index-file
> (expand-file-name "~/Mail/index.swish-e")
> "*Index file for swish-e.
> -This could be a server parameter."
> +This could be a server parameter.
> +It is never consulted once `nnir-swish-e-index-files', which should be
> +used instead, has been customized."
> :type '(file)
> :group 'nnir)
>
> +(defcustom nnir-swish-e-index-files
> + (list nnir-swish-e-index-file)
> + "*List of index files for swish-e.
> +This could be a server parameter."
> + :type '(repeat (file))
> + :group 'nnir)
> +
> (defcustom nnir-swish-e-program "swish-e"
> "*Name of swish-e search executable.
> This cannot be a server parameter."
> @@ -1196,10 +1206,10 @@
> (erase-buffer)
>
> (message "Doing swish-e query %s..." query)
> - (let* ((index-file
> + (let* ((index-files
> (or (nnir-read-server-parm
> - 'nnir-swish-e-index-file server)
> - (error "Missing parameter `nnir-swish-e-index-file'")))
> + 'nnir-swish-e-index-files server)
> + (error "Missing parameter `nnir-swish-e-index-files'")))
> (additional-switches
> (nnir-read-server-parm
> 'nnir-swish-e-additional-switches server))
> @@ -1207,7 +1217,7 @@
> nil ; input from /dev/null
> t ; output
> nil ; don't redisplay
> - "-f" ,index-file
> + "-f" ,@index-files
> ,@additional-switches
> "-w"
> ,qstring ; the query, in swish-e format
> Index: lisp/gnus-sum.el
> ===================================================================
> RCS file: /usr/local/cvsroot/gnus/lisp/gnus-sum.el,v
> retrieving revision 7.106
> diff -u -w -r7.106 gnus-sum.el
> --- lisp/gnus-sum.el 20 Nov 2005 04:46:18 -0000 7.106
> +++ lisp/gnus-sum.el 29 Nov 2005 22:00:44 -0000
> @@ -7134,7 +7134,7 @@
> (gnus-summary-position-point))
>
> (defun gnus-summary-goto-subject (article &optional force silent)
> - "Go the subject line of ARTICLE.
> + "Go to the subject line of ARTICLE.
> If FORCE, also allow jumping to articles not currently shown."
> (interactive "nArticle number: ")
> (unless (numberp article)
> Index: texi/gnus.texi
> ===================================================================
> RCS file: /usr/local/cvsroot/gnus/texi/gnus.texi,v
> retrieving revision 7.141
> diff -u -w -r7.141 gnus.texi
> --- texi/gnus.texi 22 Nov 2005 06:21:45 -0000 7.141
> +++ texi/gnus.texi 29 Nov 2005 22:00:58 -0000
> @@ -13908,7 +13908,7 @@
>
> @item :mailbox
> The name of the mailbox to get mail from. The default is @samp{INBOX}
> -which normally is the mailbox which receive incoming mail.
> +which normally is the mailbox which receives incoming mail.
>
> @item :predicate
> The predicate used to find articles to fetch. The default, @samp{UNSEEN
--
Adrian Aichner
mailto:adrian@xemacs.org
http://www.xemacs.org/
next prev parent reply other threads:[~2005-12-04 22:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-29 22:09 Adrian Aichner
2005-12-04 22:56 ` Adrian Aichner [this message]
2005-12-05 13:58 ` [ping ding] " Reiner Steib
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1x0s4gjp.fsf@smtprelay.t-online.de \
--to=adrian@xemacs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).