[Emacs-diffs] /srv/bzr/emacs/trunk r105953: lisp/descr-text.el (describe-char-categories): Accept multiline descriptions.

[Juanma Barranquero]

------------------------------------------------------------
revno: 105953
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-29 02:12:44 +0200
message:
  lisp/descr-text.el (describe-char-categories): Accept multiline descriptions.
modified:
  lisp/ChangeLog
  lisp/descr-text.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-28 20:50:16 +0000
+++ b/lisp/ChangeLog    2011-09-29 00:12:44 +0000
@@ -1,3 +1,8 @@
+2011-09-29  Juanma Barranquero  <address@hidden>
+
+       * descr-text.el (describe-char-categories): Accept category
+       descriptions more than one line long.
+
 2011-09-28  Stefan Monnier  <address@hidden>
 
        * simple.el (delete-trailing-whitespace): Fix last change.

=== modified file 'lisp/descr-text.el'
--- a/lisp/descr-text.el        2011-04-19 13:44:55 +0000
+++ b/lisp/descr-text.el        2011-09-29 00:12:44 +0000
@@ -366,9 +366,10 @@
       (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 ", ")))))