From 530f7b672740a4799d1fe40fd47d849e91c5ca68 Mon Sep 17 00:00:00 2001
From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 24 Oct 2010 00:29:21 +0000
Subject: [PATCH] gnus-group.el (gnus-group-completing-read): Remove all
 newlines from group names.  They mess up the group buffer badly. shr.el
 (shr-tag-strong): Added.

---
 lisp/gnus/ChangeLog     |  7 +++++++
 lisp/gnus/gnus-group.el | 12 +++++++-----
 lisp/gnus/shr.el        |  3 +++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 699e1b6da5a..1ba2f75b00c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,12 @@
+2010-10-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* shr.el (shr-tag-strong): Added.
+
 2010-10-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-group.el (gnus-group-completing-read): Remove all newlines from
+	group names.  They mess up the group buffer badly.
+
 	* shr.el (shr-tag-img): Don't bug out on images that don't have a SRC.
 
 	* gnus-group.el (gnus-group-mark-group): Use gnus-group-position-point
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 7720c1cc7e6..667c4bafcd8 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2189,11 +2189,13 @@ if it is not a list."
 				      require-match initial-input
 				      (or hist 'gnus-group-history)
 				      def))
-    (if (if (listp collection)
-	    (member group (mapcar 'symbol-name collection))
-	  (symbol-value (intern-soft group collection)))
-	group
-      (mm-encode-coding-string group (gnus-group-name-charset nil group)))))
+    (unless (if (listp collection)
+		(member group (mapcar 'symbol-name collection))
+	      (symbol-value (intern-soft group collection)))
+      (setq group
+	    (mm-encode-coding-string
+	     group (gnus-group-name-charset nil group))))
+    (replace-regexp-in-string "\n" "" group)))
 
 ;;;###autoload
 (defun gnus-fetch-group (group &optional articles)
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 6646cecb2fa..1eb629e4874 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -441,6 +441,9 @@ Return a string with image data."
 (defun shr-tag-em (cont)
   (shr-fontize-cont cont 'bold))
 
+(defun shr-tag-strong (cont)
+  (shr-fontize-cont cont 'bold))
+
 (defun shr-tag-u (cont)
   (shr-fontize-cont cont 'underline))
 
-- 
2.39.5