2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 730cf65c8d5..f0e152d3ffe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-19  Gustav Hållberg  <gustav@gmail.com>  (tiny change)
+
+        * descr-text.el (describe-char): Avoid trailing whitespace.  (Bug#6423)
+
 2010-06-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/edebug.el (edebug-read-list):
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 218f2a51d7f..735023ceb02 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -618,7 +618,7 @@ as well as widgets, buttons, overlays, and text properties."
               ,@(if (not eight-bit-p)
                     (let ((unicodedata (describe-char-unicode-data char)))
                       (if unicodedata
-                          (cons (list "Unicode data" " ") unicodedata))))))
+                          (cons (list "Unicode data" "") unicodedata))))))
       (setq max-width (apply 'max (mapcar (lambda (x)
                                             (if (cadr x) (length (car x)) 0))
                                           item-list)))
@@ -642,7 +642,8 @@ as well as widgets, buttons, overlays, and text properties."
                               (window-width))
                       (insert "\n")
                       (indent-to (1+ max-width)))
-                    (insert " " clm)))
+                    (unless (zerop (length clm))
+                      (insert " " clm))))
                 (insert "\n"))))
 
           (when overlays