[Emacs-diffs] /srv/bzr/emacs/trunk r102670: shr.el (shr-insert): Set shr-start after deleting trailing space; don't delete it within indentation.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102670
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-12-16 00:55:04 +0000
message:
  shr.el (shr-insert): Set shr-start after deleting trailing space; don't 
delete it within indentation.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-12-15 22:24:36 +0000
+++ b/lisp/gnus/ChangeLog       2010-12-16 00:55:04 +0000
@@ -1,3 +1,8 @@
+2010-12-16  Katsumi Yamaoka  <address@hidden>
+
+       * shr.el (shr-insert): Set shr-start after deleting trailing space;
+       don't delete it within indentation.
+
 2010-12-15  Lars Magne Ingebrigtsen  <address@hidden>
 
        * nnimap.el (nnimap-retrieve-group-data-early): Fix the syntax of the

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-12-09 23:20:33 +0000
+++ b/lisp/gnus/shr.el  2010-12-16 00:55:04 +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)