lisp/descr-text.el (describe-char-categories): Accept multiline descriptions.

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.

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 ", ")))))