From 271cdf4a239c0eb8a663b8db63e577b5864b3340 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 5 Apr 2004 23:08:15 +0000 Subject: [PATCH] Synch to No Gnus 200404051420. --- contrib/ChangeLog | 6 ++++++ contrib/nnir.el | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 623a09b..3ff6caf 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2004-04-05 Reiner Steib + + * nnir.el (nnir-group-server): Move before first use. + From Andreas Schwab . + Fix doc-string, indent. + 2004-03-15 Reiner Steib * nnir.el (nnir-run-swish-e): Fixed typo. From Adrian Lanz diff --git a/contrib/nnir.el b/contrib/nnir.el index 7878435..926b4b9 100644 --- a/contrib/nnir.el +++ b/contrib/nnir.el @@ -298,7 +298,7 @@ ;;; Setup Code: -(defconst nnir-version "$Id: nnir.el,v 1.1.6.1.4.2 2004-03-15 09:46:13 yamaoka Exp $" +(defconst nnir-version "$Id: nnir.el,v 1.1.6.1.4.3 2004-04-05 23:08:14 yamaoka Exp $" "Version of NNIR.") (require 'cl) @@ -692,7 +692,17 @@ that it is for Namazu, not Glimpse." '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. @@ -1486,17 +1496,6 @@ form 'backend:name'." ;; (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. The Gnus backend/server information is added." -- 1.7.10.4