From: Gnus developers <ding@gnus.org>
Date: Sun, 17 Oct 2010 00:04:06 +0000 (+0000)
Subject: shr.el (shr-tag-img): Don't align images -- since we're not rescaling, this often... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~580
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b57a665db15e302ad3b3985ca201303463429e73;p=emacs.git

shr.el (shr-tag-img): Don't align images -- since we're not rescaling, this often leads to ugly displays.
gnus-sum.el (gnus-summary-refer-thread): Bug fix. Add the thread headers to gnus-newsgroup-headers.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5242947c2f5..fcb79363736 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-16  Andrew Cohen  <cohen@andy.bu.edu>
+
+	* gnus-sum.el (gnus-summary-refer-thread): Bug fix. Add the thread
+	headers to gnus-newsgroup-headers.
+
+2010-10-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* shr.el (shr-tag-img): Don't align images -- since we're not
+	rescaling, this often leads to ugly displays.
+
 2010-10-15  Andrew Cohen  <cohen@andy.bu.edu>
 
 	* gnus-sum.el (gnus-summary-refer-thread): unconditionally ignore
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c50d8aabf7b..39f63149497 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8834,7 +8834,11 @@ variable."
 	(limit (if limit (prefix-numeric-value limit)
 		 gnus-refer-thread-limit)))
     (if  (gnus-check-backend-function 'request-thread gnus-newsgroup-name)
-	(gnus-request-thread id)
+	(setq gnus-newsgroup-headers
+	      (gnus-merge 'list
+			  gnus-newsgroup-headers
+			  (gnus-request-thread id)
+			  'gnus-article-sort-by-number))
       (unless (eq gnus-fetch-old-headers 'invisible)
 	(gnus-message 5 "Fetching headers for %s..." gnus-newsgroup-name)
 	;;	Retrieve the headers and read them in.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 6499b35d072..998ad30aed2 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -426,27 +426,7 @@ Return a string with image data."
 	       (not (eq shr-state 'image)))
       (insert "\n"))
     (let ((alt (cdr (assq :alt cont)))
-	  (url (cdr (assq :src cont)))
-	  (width (cdr (assq :width cont))))
-      ;; Only respect align if width specified.
-      (when width
-	;; Check that width is not larger than max width, otherwise ignore
-	;; align
-	(let ((max-width (* shr-width (frame-char-width)))
-	      (width (string-to-number width)))
-	  (when (< width max-width)
-	    (let ((align (cdr (assq :align cont))))
-	      (cond
-	       ((string= align "right")
-		(insert (propertize
-			 " " 'display
-			 `(space . (:align-to
-				    ,(list (- max-width width)))))))
-	       ((string= align "center")
-		(insert (propertize
-			 " " 'display
-			 `(space . (:balign-to
-				    ,(list (- (/ max-width 2) width))))))))))))
+	  (url (cdr (assq :src cont))))
       (let ((start (point-marker)))
 	(when (zerop (length alt))
 	  (setq alt "[img]"))