diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/descr-text.el | 16 |
2 files changed, 8 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 533ecae39e2..c4d54f42cf7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-08-09 Chong Yidong <cyd@gnu.org> + * 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. diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 6be33066d52..bf0e413d357 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -679,17 +679,11 @@ relevant to POS." (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 |