[gnus git] branch master updated: =2= * gnus-sum.el (gnus-user-date): Renamed back from gnus-summary-user-date since user code refers to it. ; * shr.el (shr-render-td): Store the actual background colour used.

       via  829f8a02f394b3e8735deb36b2845928b0bf1774 (commit)
       via  fabb502cdc40a3e17d3314651d2f95acb346f003 (commit)
      from  38514cc0cc2016d69948f2cf103cc9742421278c (commit)


- Log -----------------------------------------------------------------
commit 829f8a02f394b3e8735deb36b2845928b0bf1774
Author: Lars Ingebrigtsen <[email protected]>
Date:   Fri Feb 4 08:43:11 2011 -0800

    * gnus-sum.el (gnus-user-date): Renamed back from gnus-summary-user-date since user code refers to it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf5d98c..24cf7dd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-04  Lars Ingebrigtsen  <[email protected]>
 
+	* gnus-sum.el (gnus-user-date): Renamed back from
+	gnus-summary-user-date since user code refers to it.
+
 	* shr.el (shr-render-td): Store the actual background colour used.
 
 	* message.el (message-setup-1): Don't bind the constant
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index c40fcc7..8221667 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1395,7 +1395,7 @@ the normal Gnus MIME machinery."
     (?u gnus-tmp-user-defined ?s)
     (?P (gnus-pick-line-number) ?d)
     (?B gnus-tmp-thread-tree-header-string ?s)
-    (user-date (gnus-summary-user-date
+    (user-date (gnus-user-date
 		,(macroexpand '(mail-header-date gnus-tmp-header))) ?s))
   "An alist of format specifications that can appear in summary lines.
 These are paired with what variables they correspond with, along with
@@ -3882,7 +3882,7 @@ respectively."
 (make-obsolete-variable 'gnus-user-date-format-alist
                         'gnus-summary-user-date-format-alist "24.1")
 
-(defun gnus-summary-user-date (messy-date)
+(defun gnus-user-date (messy-date)
   "Format the messy-date according to `gnus-summary-user-date-format-alist'.
 Returns \"  ?  \" if there's bad input or if another error occurs.
 Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"."

commit fabb502cdc40a3e17d3314651d2f95acb346f003
Author: Lars Ingebrigtsen <[email protected]>
Date:   Fri Feb 4 03:35:25 2011 -0800

    * shr.el (shr-render-td): Store the actual background colour used.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9522f82..cf5d98c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-02-04  Lars Ingebrigtsen  <[email protected]>
 
+	* shr.el (shr-render-td): Store the actual background colour used.
+
 	* message.el (message-setup-1): Don't bind the constant
 	-forbidden-properties.
 	(message-setup-1): Revert previous change, since it needs to bind the
diff --git a/lisp/shr.el b/lisp/shr.el
index 10e04a8..5b4e6c7 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -601,7 +601,8 @@ ones, in case fg and bg are nil."
 	(when fg
 	  (shr-put-color start end :foreground (cadr new-colors)))
 	(when bg
-	  (shr-put-color start end :background (car new-colors)))))))
+	  (shr-put-color start end :background (car new-colors))))
+      new-colors)))
 
 ;; Put a color in the region, but avoid putting colors on on blank
 ;; text at the start of the line, and the newline at the end, to avoid
@@ -1126,7 +1127,7 @@ ones, in case fg and bg are nil."
 	  (fgcolor (cdr (assq :fgcolor cont)))
 	  (style (cdr (assq :style cont)))
 	  (shr-stylesheet shr-stylesheet)
-	  overlays)
+	  overlays actual-colors)
       (when style
 	(setq style (and (string-match "color" style)
 			 (shr-parse-style style))))
@@ -1178,16 +1179,17 @@ ones, in case fg and bg are nil."
 		(insert (make-string (- width (current-column)) ? )))
 	      (forward-line 1)))
 	  (when style
+	    (setq actual-colors
 	    (shr-colorize-region
 	     (point-min) (point-max)
 	     (cdr (assq 'color shr-stylesheet))
-	     (cdr (assq 'background-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)
-		  (cdr (assq 'background-color shr-stylesheet)))
+		  (car actual-colors))
 	  (list max
 		(shr-natural-width)))))))
 

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    5 +++++
 lisp/gnus-sum.el |    4 ++--
 lisp/shr.el      |   16 +++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project