[PATCH] packages: sync gnus/nnir.el with upstream gnus cvs
This trivial full sync makes nnir work for me.
Without it creating the ephemeral nnir group fails.
I'm using
nnir-search-engine 'swish-e
Let me know any issues.
I intend to commit in a few days.
Best regards,
Adrian
packages ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: xemacs-packages/gnus/ChangeLog
Index: xemacs-packages/gnus/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/ChangeLog,v
retrieving revision 1.93
diff -u -U0 -r1.93 ChangeLog
--- xemacs-packages/gnus/ChangeLog 12 Oct 2005 08:11:15 -0000 1.93
+++ xemacs-packages/gnus/ChangeLog 14 Nov 2005 23:36:52 -0000
＠＠ -0,0 +1,8 ＠＠
+2005-11-15 Adrian Aichner <adrian(a)xemacs.org>
+
+ * lisp/nnir.el: Sync with upstream gnus/contrib/nnir.el.
+ * lisp/nnir.el (nnir):
+ * lisp/nnir.el (nnir-group-server): New.
+ * lisp/nnir.el (nnir-run-glimpse):
+ * lisp/nnir.el (nnir-run-swish-e):
+
packages source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: xemacs-packages/gnus/lisp/nnir.el
Index: xemacs-packages/gnus/lisp/nnir.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnir.el,v
retrieving revision 1.1
diff -u -w -r1.1 nnir.el
--- xemacs-packages/gnus/lisp/nnir.el 28 Sep 2004 02:21:17 -0000 1.1
+++ xemacs-packages/gnus/lisp/nnir.el 14 Nov 2005 23:33:12 -0000
＠＠ -18,8 +18,8 ＠＠
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
＠＠ -376,7 +376,8 ＠＠
;;; User Customizable Variables:
(defgroup nnir nil
- "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS.")
+ "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS."
+:group 'gnus)
;; Mail backend.
＠＠ -689,7 +690,17 ＠＠
'gnus-group-make-nnir-group))
(add-hook 'gnus-group-mode-hook 'nnir-group-mode-hook)
-
+(defmacro nnir-group-server (group)
+ "Return the server for a foreign newsgroup GROUP.
+The returned format is as `gnus-server-to-method' needs it. See
+`gnus-group-real-prefix' and `gnus-group-real-name'."
+ `(let ((gname ,group))
+ (if (string-match "^\\([^:]+\\):" gname)
+ (setq gname (match-string 1 gname))
+ nil)
+ (if (string-match "^\\([^+]+\\)\\+\\(.+\\)$" gname)
+ (format "%s:%s" (match-string 1 gname) (match-string 2 gname))
+ (concat gname ":"))))
;; Summary mode commands.
＠＠ -862,7 +873,7 ＠＠
(let ((artlist nil)
(groupspec (cdr (assq 'group query)))
(qstring (cdr (assq 'query query)))
- (prefix (nnir-read-server-parm 'nnir-glimps-remove-prefix server))
+ (prefix (nnir-read-server-parm 'nnir-glimpse-remove-prefix server))
artno dirnam)
(when (and group groupspec)
(error (concat "It does not make sense to use a group spec"
＠＠ -1191,7 +1202,7 ＠＠
(error "Missing parameter `nnir-swish-e-index-file'")))
(additional-switches
(nnir-read-server-parm
- 'nnir-swish++-additional-switches server))
+ 'nnir-swish-e-additional-switches server))
(cp-list `(,nnir-swish-e-program
nil ; input from /dev/null
t ; output
＠＠ -1482,17 +1493,6 ＠＠
;; (symbol-value key))
;; (symbol-value key))
;; ))
-
-(defmacro nnir-group-server (group)
- "Returns the server for a foreign newsgroup in the format as gnus-server-to-method
needs it. Compare to gnus-group-real-prefix and gnus-group-real-name."
- `(let ((gname ,group))
- (if (string-match "^\\([^:]+\\):" gname)
- (setq gname (match-string 1 gname))
- nil)
- (if (string-match "^\\([^+]+\\)\\+\\(.+\\)$" gname)
- (format "%s:%s" (match-string 1 gname) (match-string 2 gname))
- (concat gname ":"))
- ))
(defun nnir-group-full-name (shortname server)
"For the given group name, return a full Gnus group name.
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/