[Emacs-diffs] /srv/bzr/emacs/trunk r101783: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101783
author: Gnus developers
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-10-04 10:16:57 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus-html.el (gnus-html-put-image): Fix resize image code.
  shr.el (shr-ensure-paragraph): Fix the non-empty line case.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-html.el
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-04 07:42:58 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-04 10:16:57 +0000
@@ -1,5 +1,13 @@
 2010-10-04  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * shr.el (shr-ensure-paragraph): Fix the non-empty line case.
+
+2010-10-04  Julien Danjou  <address@hidden>
+
+       * gnus-html.el (gnus-html-put-image): Fix resize image code.
+
+2010-10-04  Lars Magne Ingebrigtsen  <address@hidden>
+
        * shr.el (shr-insert): Use string anchors instead of line anchors.
 
 2010-10-03  Lars Magne Ingebrigtsen  <address@hidden>

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-10-04 00:17:16 +0000
+++ b/lisp/gnus/gnus-html.el    2010-10-04 10:16:57 +0000
@@ -431,17 +431,19 @@
                                  (= (car size) 30)
                                  (= (cdr size) 30))))
                   ;; Good image, add it!
-                  (let ((image (gnus-html-rescale-image
+                  (let ((image (gnus-rescale-image
                                 image
-                                ;; (width . height)
-                                (cons
-                                 ;; Aimed width
-                                 (truncate
-                                  (* gnus-max-image-proportion
-                                     (- (nth 2 edges) (nth 0 edges))))
-                                 ;; Aimed height
-                                 (truncate (* gnus-max-image-proportion
-                                              (- (nth 3 edges) (nth 1 
edges))))))))
+                                (let ((edges (gnus-window-inside-pixel-edges
+                                              (get-buffer-window 
(current-buffer)))))
+                                  ;; (width . height)
+                                  (cons
+                                   ;; Aimed width
+                                   (truncate
+                                    (* gnus-max-image-proportion
+                                       (- (nth 2 edges) (nth 0 edges))))
+                                   ;; Aimed height
+                                   (truncate (* gnus-max-image-proportion
+                                                (- (nth 3 edges) (nth 1 
edges)))))))))
                     (delete-region start end)
                     (gnus-put-image image alt-text 'external)
                     (gnus-put-text-property start (point) 'help-echo alt-text)

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2010-10-04 07:42:58 +0000
+++ b/lisp/gnus/shr.el  2010-10-04 10:16:57 +0000
@@ -101,7 +101,7 @@
          (insert "\n"))
       (if (save-excursion
            (beginning-of-line)
-           (looking-at " *"))
+           (looking-at " *$"))
          (insert "\n")
        (insert "\n\n")))))