projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add newlines between pictures and text.
[gnus]
/
lisp
/
shr.el
diff --git
a/lisp/shr.el
b/lisp/shr.el
index
2b26a79
..
f1dbfef
100644
(file)
--- a/
lisp/shr.el
+++ b/
lisp/shr.el
@@
-51,6
+51,7
@@
fit these criteria."
:type 'regexp)
(defvar shr-folding-mode nil)
:type 'regexp)
(defvar shr-folding-mode nil)
+(defvar shr-state nil)
(defvar shr-width 70)
(defvar shr-width 70)
@@
-66,9
+67,10
@@
fit these criteria."
(push (shr-transform-dom sub) result)))
(nreverse result)))
(push (shr-transform-dom sub) result)))
(nreverse result)))
+;;;###autoload
(defun shr-insert-document (dom)
(defun shr-insert-document (dom)
- (
setq dom (shr-transform-dom dom
))
-
(shr-descend dom
))
+ (
let ((shr-state nil
))
+
(shr-descend (shr-transform-dom dom))
))
(defun shr-descend (dom)
(let ((function (intern (concat "shr-" (symbol-name (car dom))) obarray)))
(defun shr-descend (dom)
(let ((function (intern (concat "shr-" (symbol-name (car dom))) obarray)))
@@
-134,13
+136,15
@@
fit these criteria."
((and shr-blocked-images
(string-match shr-blocked-images url))
(insert alt))
((and shr-blocked-images
(string-match shr-blocked-images url))
(insert alt))
- ((url-is-cached
url
)
+ ((url-is-cached
(browse-url-url-encode-chars url "[&)$ ]")
)
(shr-put-image (shr-get-image-data url) (point) alt))
(t
(insert alt)
(url-retrieve url 'shr-image-fetched
(shr-put-image (shr-get-image-data url) (point) alt))
(t
(insert alt)
(url-retrieve url 'shr-image-fetched
- (list (current-buffer) start (point-marker)))))
- (insert " "))))
+ (list (current-buffer) start (point-marker))
+ t)))
+ (insert " ")
+ (setq shr-state 'image))))
(defun shr-image-fetched (status buffer start end)
(when (and (buffer-name buffer)
(defun shr-image-fetched (status buffer start end)
(when (and (buffer-name buffer)
@@
-203,6
+207,9
@@
fit these criteria."
(insert "\n")))
(defun shr-insert (text)
(insert "\n")))
(defun shr-insert (text)
+ (when (eq shr-state 'image)
+ (insert "\n")
+ (setq shr-state nil))
(cond
((eq shr-folding-mode 'none)
(insert t))
(cond
((eq shr-folding-mode 'none)
(insert t))