Merge from emacs--rel--22

Revision: [email protected]/emacs--devo--0--patch-1095

2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d71fcb0e73..7cc373e435 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,9 +1,14 @@
 2008-03-07  Karl Fogel  <[email protected]>
 
-	* lisp/gnus/gnus-bookmark.el: Adjust for renames in bookmark.el.
+	* gnus-bookmark.el: Adjust for renames in bookmark.el.
 	(gnus-bookmark-make-record): Was `gnus-bookmark-make-cell'.
 	(gnus-bookmark-jump): Adjust some variable names.
 
+2008-03-05  Reiner Steib  <[email protected]>
+
+	* gnus-sum.el (gnus-print-buffer): Honor ps-print-color-p.
+	Suggested by <[email protected]>.
+
 2008-03-05  Glenn Morris  <[email protected]>
 
 	* gnus-art.el (gnus-article-mode-line-format-alist): Move to gnus-sum.
@@ -144,9 +149,9 @@
 2008-02-11  Reiner Steib  <[email protected]>
 
 	* gnus-topic.el (gnus-topic-select-group, gnus-topic-read-group):
-	Document negativ prefix.
+	Document negative prefix.
 
-	* gnus-group.el (gnus-group-read-group): Document negativ prefix.
+	* gnus-group.el (gnus-group-read-group): Document negative prefix.
 
 2008-02-10  Lars Magne Ingebrigtsen  <[email protected]>
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index ce22d17168..48232ae53f 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9277,7 +9277,7 @@ to save in."
 			  (mail-header-date gnus-current-headers) ")"))))
 	    (gnus-run-hooks 'gnus-ps-print-hook)
 	    (save-excursion
-	      (if window-system
+	      (if ps-print-color-p
 		  (ps-spool-buffer-with-faces)
 		(ps-spool-buffer)))))
       (kill-buffer buffer))))