[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101784: shr.el (shr-insert): Tweak l
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101784: shr.el (shr-insert): Tweak line breaking. |
Date: |
Mon, 04 Oct 2010 10:43:14 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101784
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-10-04 10:43:14 +0000
message:
shr.el (shr-insert): Tweak line breaking.
shr.el (shr-insert): Handle <pre> better.
modified:
lisp/gnus/ChangeLog
lisp/gnus/shr.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-10-04 10:16:57 +0000
+++ b/lisp/gnus/ChangeLog 2010-10-04 10:43:14 +0000
@@ -1,6 +1,8 @@
2010-10-04 Lars Magne Ingebrigtsen <address@hidden>
* shr.el (shr-ensure-paragraph): Fix the non-empty line case.
+ (shr-insert): Tweak line breaking.
+ (shr-insert): Handle <pre> better.
2010-10-04 Julien Danjou <address@hidden>
=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el 2010-10-04 10:16:57 +0000
+++ b/lisp/gnus/shr.el 2010-10-04 10:43:14 +0000
@@ -214,14 +214,14 @@
image)))
(defun shr-tag-pre (cont)
- (let ((shr-folding-mode nil))
+ (let ((shr-folding-mode 'none))
(shr-ensure-newline)
(shr-generic cont)
(shr-ensure-newline)))
(defun shr-tag-blockquote (cont)
(let ((shr-indentation (+ shr-indentation 4)))
- (shr-tag-pre cont)))
+ (shr-generic cont)))
(defun shr-ensure-newline ()
(unless (zerop (current-column))
@@ -233,7 +233,7 @@
(setq shr-state nil))
(cond
((eq shr-folding-mode 'none)
- (insert t))
+ (insert text))
(t
(let ((first t)
column)
@@ -244,7 +244,9 @@
(setq column (current-column))
(when (> column 0)
(cond
- ((> (+ column (length elem) 1) shr-width)
+ ((and (or (not first)
+ (eq shr-state 'space))
+ (> (+ column (length elem) 1) shr-width))
(insert "\n"))
((not first)
(insert " "))))
@@ -258,9 +260,11 @@
(unless shr-start
(setq shr-start (point)))
(insert elem))
+ (setq shr-state nil)
(when (and (string-match "[ \t\n]\\'" text)
(not (bolp)))
- (insert " "))))))
+ (insert " ")
+ (setq shr-state 'space))))))
(defun shr-get-image-data (url)
"Get image data for URL.
@@ -293,7 +297,8 @@
(shr-generic cont))
(defun shr-tag-br (cont)
- (shr-ensure-newline)
+ (unless (bobp)
+ (insert "\n"))
(shr-generic cont))
(defun shr-tag-h1 (cont)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101784: shr.el (shr-insert): Tweak line breaking.,
Katsumi Yamaoka <=