Mercurial > emacs
changeset 111973:d60eda14e134
shr.el (shr-insert): Set shr-start after deleting trailing space; don't delete it within indentation.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 16 Dec 2010 00:55:04 +0000 |
| parents | 3b8b4f28c758 |
| children | 2faf9c0a9055 |
| files | lisp/gnus/ChangeLog lisp/gnus/shr.el |
| diffstat | 2 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Dec 15 22:24:36 2010 +0000 +++ b/lisp/gnus/ChangeLog Thu Dec 16 00:55:04 2010 +0000 @@ -1,3 +1,8 @@ +2010-12-16 Katsumi Yamaoka <yamaoka@jpl.org> + + * shr.el (shr-insert): Set shr-start after deleting trailing space; + don't delete it within indentation. + 2010-12-15 Lars Magne Ingebrigtsen <larsi@gnus.org> * nnimap.el (nnimap-retrieve-group-data-early): Fix the syntax of the
--- a/lisp/gnus/shr.el Wed Dec 15 22:24:36 2010 +0000 +++ b/lisp/gnus/shr.el Thu Dec 16 00:55:04 2010 +0000 @@ -253,16 +253,12 @@ (when (and (bolp) (> shr-indentation 0)) (shr-indent)) - ;; The shr-start is a special variable that is used to pass - ;; upwards the first point in the buffer where the text really - ;; starts. - (unless shr-start - (setq shr-start (point))) ;; No space is needed behind a wide character categorized as ;; kinsoku-bol, between characters both categorized as nospace, ;; or at the beginning of a line. (let (prev) - (when (and (eq (preceding-char) ? ) + (when (and (> (current-column) shr-indentation) + (eq (preceding-char) ? ) (or (= (line-beginning-position) (1- (point))) (and (shr-char-breakable-p (setq prev (char-after (- (point) 2)))) @@ -270,6 +266,11 @@ (and (shr-char-nospace-p prev) (shr-char-nospace-p (aref elem 0))))) (delete-char -1))) + ;; The shr-start is a special variable that is used to pass + ;; upwards the first point in the buffer where the text really + ;; starts. + (unless shr-start + (setq shr-start (point))) (insert elem) (let (found) (while (and (> (current-column) shr-width)