[Emacs-diffs] /srv/bzr/emacs/trunk r109532: * descr-text.el (describe-char): Don't insert extra newlines.

[Chong Yidong]

------------------------------------------------------------
revno: 109532
fixes bug: http://debbugs.gnu.org/10127
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-09 16:10:32 +0800
message:
  * descr-text.el (describe-char): Don't insert extra newlines.
modified:
  lisp/ChangeLog
  lisp/descr-text.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-09 07:45:23 +0000
+++ b/lisp/ChangeLog    2012-08-09 08:10:32 +0000
@@ -1,5 +1,8 @@
 2012-08-09  Chong Yidong  <address@hidden>
 
+       * descr-text.el (describe-char): Don't insert extra newlines
+       (Bug#10127).
+
        * vc/log-view.el (log-view-diff): Use use-region-p (Bug#10133).
        (log-view-diff-changeset, log-view-minor-wrap): Likewise.
 

=== modified file 'lisp/descr-text.el'
--- a/lisp/descr-text.el        2012-07-17 18:15:02 +0000
+++ b/lisp/descr-text.el        2012-08-09 08:10:32 +0000
@@ -679,17 +679,11 @@
               (when (cadr elt)
                 (insert (format formatter (car elt)))
                 (dolist (clm (cdr elt))
-                  (if (eq (car-safe clm) 'insert-text-button)
-                      (progn (insert " ") (eval clm))
-                    (when (>= (+ (current-column)
-                                 (or (string-match-p "\n" clm)
-                                     (string-width clm))
-                                 1)
-                              (window-width))
-                      (insert "\n")
-                      (indent-to (1+ max-width)))
-                    (unless (zerop (length clm))
-                      (insert " " clm))))
+                 (cond ((eq (car-safe clm) 'insert-text-button)
+                        (insert " ")
+                        (eval clm))
+                       ((not (zerop (length clm)))
+                        (insert " " clm))))
                 (insert "\n"))))
 
           (when overlays