shr.el (shr-render-td): Only do colours at the final rendering. Should be slightly...

 (shr-insert-table): Fix up TD background colours when doing the vertical padding.
gnus-art.el (article-update-date-lapsed): Don't use current-column to find the horizontal position.  It's fragile in the presence of \003 characters.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9c94a2ba2fa2195c09fa9cb35619c4786be9c978..bade634abd61bfca383334b746f90df02fa56889 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,7 +1,14 @@
 2011-02-01  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * shr.el (shr-render-td): Only do colours at the final rendering.
+       Should be slightly faster.
+       (shr-insert-table): Fix up TD background colours when doing the
+       vertical padding.
+
        * gnus-art.el (article-date-ut): Protect against articles with no Date
        header.
+       (article-update-date-lapsed): Don't use current-column to find the
+       horizontal position.  It's fragile in the presence of \003 characters.
 
        * gnus-start.el (gnus-read-active-file-1): Remove dead parameter infos.
 

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 07eabd98a6d7131fd85c554a944f18cc5ab0ed46..af47daf970b149d8bacc4c516df3c2cfc5c37b76 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3645,7 +3645,7 @@ function and want to see what the date was before converting."
           (set-buffer (window-buffer w))
           (when (eq major-mode 'gnus-article-mode)
             (let ((old-line (count-lines (point-min) (point)))
-                  (old-column (current-column)))
+                  (old-column (- (point) (line-beginning-position))))
               (goto-char (point-min))
               (while (re-search-forward "^Date:" nil t)
                 (let ((type (get-text-property (match-beginning 0) 'gnus-date-type)))

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index f3c75ccd6a31c5db06e40a4c4bef2092c74accb4..10e04a87d934e36bc57730c7e820556c77784015 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -1055,8 +1055,11 @@ ones, in case fg and bg are nil."
          ;; possibly.
          (dotimes (i (- height (length lines)))
            (end-of-line)
-           (insert (make-string (string-width (car lines)) ? )
-                   shr-table-vertical-line)
+           (let ((start (point)))
+             (insert (make-string (string-width (car lines)) ? )
+                     shr-table-vertical-line)
+             (when (nth 4 column)
+               (shr-put-color start (1- (point)) :background (nth 4 column))))
            (forward-line 1)))))
     (shr-insert-table-ruler widths)))
 
@@ -1173,17 +1176,18 @@ ones, in case fg and bg are nil."
              (end-of-line)
              (when (> (- width (current-column)) 0)
                (insert (make-string (- width (current-column)) ? )))
-             (forward-line 1))))
-       (when style
-         (shr-colorize-region
-          (point-min) (point-max)
-          (cdr (assq 'color shr-stylesheet))
-          (cdr (assq 'background-color shr-stylesheet))))
+             (forward-line 1)))
+         (when style
+           (shr-colorize-region
+            (point-min) (point-max)
+            (cdr (assq 'color shr-stylesheet))
+            (cdr (assq 'background-color shr-stylesheet)))))
        (if fill
            (list max
                  (count-lines (point-min) (point-max))
                  (split-string (buffer-string) "\n")
-                 (shr-collect-overlays))
+                 (shr-collect-overlays)
+                 (cdr (assq 'background-color shr-stylesheet)))
          (list max
                (shr-natural-width)))))))