From: Lars Magne Ingebrigtsen Date: Mon, 3 Nov 2014 01:02:37 +0000 (+0100) Subject: * net/shr.el (shr-retransform-dom): Allow several text sub-nodes. X-Git-Tag: emacs-25.0.90~2635^2~587 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=01af3a585dd7c7051503cf06fd4ac3d78558b8d2;p=emacs.git * net/shr.el (shr-retransform-dom): Allow several text sub-nodes. --- diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 59326de64dd..f32dc651d49 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -374,12 +374,11 @@ size, and full-buffer size." "Transform the shr DOM back into the libxml DOM." (let ((tag (car dom)) (attributes nil) - (text nil) (sub-nodes nil)) (dolist (elem (cdr dom)) (cond ((eq (car elem) 'text) - (setq text (cdr elem))) + (push (cdr elem) sub-nodes)) ((not (consp (cdr elem))) (push (cons (intern (substring (symbol-name (car elem)) 1) obarray) (cdr elem)) @@ -387,8 +386,7 @@ size, and full-buffer size." (t (push (shr-retransform-dom elem) sub-nodes)))) (append (list tag (nreverse attributes)) - (nreverse sub-nodes) - (and text (list text))))) + (nreverse sub-nodes)))) (defsubst shr-generic (cont) (dolist (sub cont)