diff options
| -rw-r--r-- | lisp/net/eww.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 08a40cef182..6b7fa05ded5 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el | |||
| @@ -349,9 +349,6 @@ Currently this means either text/html or application/xhtml+xml." | |||
| 349 | "application/xhtml+xml"))) | 349 | "application/xhtml+xml"))) |
| 350 | 350 | ||
| 351 | (defun eww-render (status url &optional point buffer encode) | 351 | (defun eww-render (status url &optional point buffer encode) |
| 352 | (let ((redirect (plist-get status :redirect))) | ||
| 353 | (when redirect | ||
| 354 | (setq url redirect))) | ||
| 355 | (let* ((headers (eww-parse-headers)) | 352 | (let* ((headers (eww-parse-headers)) |
| 356 | (content-type | 353 | (content-type |
| 357 | (mail-header-parse-content-type | 354 | (mail-header-parse-content-type |
| @@ -364,7 +361,11 @@ Currently this means either text/html or application/xhtml+xml." | |||
| 364 | (eww-detect-charset (eww-html-p (car content-type))) | 361 | (eww-detect-charset (eww-html-p (car content-type))) |
| 365 | "utf-8")))) | 362 | "utf-8")))) |
| 366 | (data-buffer (current-buffer)) | 363 | (data-buffer (current-buffer)) |
| 364 | (shr-target-id (url-target (url-generic-parse-url url))) | ||
| 367 | last-coding-system-used) | 365 | last-coding-system-used) |
| 366 | (let ((redirect (plist-get status :redirect))) | ||
| 367 | (when redirect | ||
| 368 | (setq url redirect))) | ||
| 368 | (with-current-buffer buffer | 369 | (with-current-buffer buffer |
| 369 | ;; Save the https peer status. | 370 | ;; Save the https peer status. |
| 370 | (plist-put eww-data :peer (plist-get status :peer)) | 371 | (plist-put eww-data :peer (plist-get status :peer)) |
| @@ -460,7 +461,6 @@ Currently this means either text/html or application/xhtml+xml." | |||
| 460 | (plist-put eww-data :dom document) | 461 | (plist-put eww-data :dom document) |
| 461 | (let ((inhibit-read-only t) | 462 | (let ((inhibit-read-only t) |
| 462 | (inhibit-modification-hooks t) | 463 | (inhibit-modification-hooks t) |
| 463 | (shr-target-id (url-target (url-generic-parse-url url))) | ||
| 464 | (shr-external-rendering-functions | 464 | (shr-external-rendering-functions |
| 465 | (append | 465 | (append |
| 466 | shr-external-rendering-functions | 466 | shr-external-rendering-functions |