gnus-group.el (gnus-group-completing-read): Remove all newlines from group names...

shr.el (shr-tag-strong): Added.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 699e1b6da5aba1e5f6ad51dd13002fb607e33df2..1ba2f75b00c777ae391872683a1e472a5cecff5f 100644 (file)
--- 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 7720c1cc7e6d6f1e7adddedec41c7f2fae53b564..667c4bafcd88685447fc351c230bc756e16833e0 100644 (file)
--- 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 6646cecb2fafda1ced30b65a7a28d4b334762ba6..1eb629e487448fdc14d0c72f3f9ecaba6d340e64 100644 (file)
--- 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))