[gnus git] branch no-gnus updated: m0-1-85-g333f5fb =1= Minor width-computation fixups for shr

Lars Magne Ingebrigtsen <[email protected]>
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  333f5fb73e2fb37bbd91cc23461ac7ba58e197d0 (commit)
      from  12f0d4b89c61c49e5aa8767d9db2b0839f9b27bf (commit)


- Log -----------------------------------------------------------------
commit 333f5fb73e2fb37bbd91cc23461ac7ba58e197d0
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Wed Mar 14 19:03:00 2012 +0100

    Minor width-computation fixups for shr
    
    (shr-natural-width): Compute the natural width more correctly.
    (shr-insert): Allow the natural width to be computed for tables again.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3ba10e..529ad21 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,8 @@
 	* shr.el (shr-table-widths): Divide the extra width more fairly over
 	the TDs (bug#10973).
 	(shr-render-td): Don't delete too much padding.
+	(shr-natural-width): Compute the natural width more correctly.
+	(shr-insert): Allow the natural width to be computed for tables again.
 
 	* gnus-msg.el (gnus-bug): Don't delete the other windows.  We may be
 	using a `gnus-use-full-window' setup (bug#11013).
diff --git a/lisp/shr.el b/lisp/shr.el
index e98c930..1737a82 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -340,8 +340,8 @@ the URL of the image to the kill buffer instead."
 	  (when (eq (preceding-char) ? )
 	    (delete-char -1))
 	  (insert "\n")
-	  (unless found
 	    (put-text-property (1- (point)) (point) 'shr-break t)
+	  (unless found
 	    ;; No space is needed at the beginning of a line.
 	    (when (eq (following-char) ? )
 	      (delete-char 1)))
@@ -1320,7 +1320,8 @@ ones, in case fg and bg are nil."
     (while (not (eobp))
       (end-of-line)
       (setq current (+ current (current-column)))
-      (unless (get-text-property (point) 'shr-break)
+      (if (get-text-property (point) 'shr-break)
+	  (incf current)
 	(setq max (max max current)
 	      current 0))
       (forward-line 1))

-----------------------------------------------------------------------
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 |    2 ++
 lisp/shr.el    |    5 +++--
 2 files changed, 5 insertions(+), 2 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, no-gnus has been updated


hooks/post-receive
-- 
Gnus Project
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.