* gnus.el (gnus-group-prefixed-name): Comment out the test for

colon.

* gnus-srvr.el (gnus-browse-read-group): Don't give the real name
to the ephemeral entry, but the prefixed name.

* gnus.el (gnus-group-prefixed-name): Clean up.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8a10c4..fd0026d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus.el (gnus-group-prefixed-name): Comment out the test for
+       colon. 
+
+       * gnus-srvr.el (gnus-browse-read-group): Don't give the real name
+       to the ephemeral entry, but the prefixed name.
+
+       * gnus.el (gnus-group-prefixed-name): Clean up.
+
 2003-04-13  Kevin Greiner <kgreiner@xpediantsolutions.com>
 
        * gnus-agent.el (gnus-agent-group-pathname): Bind

diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index 77596ea..f04e03b 100644 (file)
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -831,7 +831,7 @@ buffer.
     (if (or (not (gnus-get-info group))
            (gnus-ephemeral-group-p group))
        (unless (gnus-group-read-ephemeral-group
-                (gnus-group-real-name group) gnus-browse-current-method nil
+                group gnus-browse-current-method nil
                 (cons (current-buffer) 'browse))
          (error "Couldn't enter %s" group))
       (unless (gnus-group-read-group nil no-article group)
@@ -876,10 +876,9 @@ buffer.
     (beginning-of-line)
     (let ((name (get-text-property (point) 'gnus-group)))
       (when (re-search-forward ": \\(.*\\)$" (gnus-point-at-eol) t)
-       (gnus-group-prefixed-name
-        (or name
-            (match-string-no-properties 1))
-        gnus-browse-current-method)))))
+       (concat (gnus-method-to-server-name gnus-browse-current-method) ":" 
+               (or name
+                   (match-string-no-properties 1)))))))
 
 (defun gnus-browse-describe-group (group)
   "Describe the current group."

diff --git a/lisp/gnus.el b/lisp/gnus.el
index cb2a28b..6be7385 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -3179,12 +3179,16 @@ that that variable is buffer-local to the summary buffers."
   (format "%s+%s" (car method) (nth 1 method)))
 
 (defun gnus-group-prefixed-name (group method &optional full)
-  "Return the whole name from GROUP and METHOD.  Call with full set to
-get the fully qualified group name (even if the server is native)."
-  (and (stringp method) (setq method (gnus-server-to-method method)))
+  "Return the whole name from GROUP and METHOD.
+Call with full set to get the fully qualified group name (even if the
+server is native)."
+  (when (stringp method)
+    (setq method (gnus-server-to-method method)))
   (if (or (not method)
          (and (not full) (gnus-server-equal method "native"))
-         (string-match ":" group))
+         ;;;!!! This might not be right.  We'll see...
+         ;(string-match ":" group)
+         )
       group
     (concat (gnus-method-to-server-name method) ":" group)))