2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0927ff478c2..a5ca53e9f4a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * descr-text.el (describe-char-categories): Accept category
+        descriptions more than one line long.
+
 2011-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (delete-trailing-whitespace): Fix last change.
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index fca06adb2a9..7d267cec480 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -366,9 +366,10 @@ This function is semi-obsolete.  Use `get-char-code-property'."
       (list (mapconcat
              (lambda (x)
                (let* ((c (category-docstring x))
-                      (doc (if (string-match "\\`\\(.*?\\)\n\\(.*\\)\\'" c)
+                      (doc (if (string-match "\\`\\(.*?\\)\n" c)
                                (propertize (match-string 1 c)
-                                           'help-echo (match-string 2 c))
+                                           'help-echo
+                                           (substring c (1+ (match-end 1))))
                              c)))
                  (format "%c:%s" x doc)))
              mnemonics ", ")))))