diff options
| author | Lars Magne Ingebrigtsen | 2014-11-03 02:02:37 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-11-03 02:02:37 +0100 |
| commit | 01af3a585dd7c7051503cf06fd4ac3d78558b8d2 (patch) | |
| tree | 20009212eb4c828b1cc5463c1e69de8ac33e2045 | |
| parent | ab657babf013822604566732d198c6ad094d5f26 (diff) | |
| download | emacs-01af3a585dd7c7051503cf06fd4ac3d78558b8d2.tar.gz emacs-01af3a585dd7c7051503cf06fd4ac3d78558b8d2.zip | |
* net/shr.el (shr-retransform-dom): Allow several text sub-nodes.
| -rw-r--r-- | lisp/net/shr.el | 6 |
1 files changed, 2 insertions, 4 deletions
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." | |||
| 374 | "Transform the shr DOM back into the libxml DOM." | 374 | "Transform the shr DOM back into the libxml DOM." |
| 375 | (let ((tag (car dom)) | 375 | (let ((tag (car dom)) |
| 376 | (attributes nil) | 376 | (attributes nil) |
| 377 | (text nil) | ||
| 378 | (sub-nodes nil)) | 377 | (sub-nodes nil)) |
| 379 | (dolist (elem (cdr dom)) | 378 | (dolist (elem (cdr dom)) |
| 380 | (cond | 379 | (cond |
| 381 | ((eq (car elem) 'text) | 380 | ((eq (car elem) 'text) |
| 382 | (setq text (cdr elem))) | 381 | (push (cdr elem) sub-nodes)) |
| 383 | ((not (consp (cdr elem))) | 382 | ((not (consp (cdr elem))) |
| 384 | (push (cons (intern (substring (symbol-name (car elem)) 1) obarray) | 383 | (push (cons (intern (substring (symbol-name (car elem)) 1) obarray) |
| 385 | (cdr elem)) | 384 | (cdr elem)) |
| @@ -387,8 +386,7 @@ size, and full-buffer size." | |||
| 387 | (t | 386 | (t |
| 388 | (push (shr-retransform-dom elem) sub-nodes)))) | 387 | (push (shr-retransform-dom elem) sub-nodes)))) |
| 389 | (append (list tag (nreverse attributes)) | 388 | (append (list tag (nreverse attributes)) |
| 390 | (nreverse sub-nodes) | 389 | (nreverse sub-nodes)))) |
| 391 | (and text (list text))))) | ||
| 392 | 390 | ||
| 393 | (defsubst shr-generic (cont) | 391 | (defsubst shr-generic (cont) |
| 394 | (dolist (sub cont) | 392 | (dolist (sub cont) |