[Emacs-diffs] master 43e792c: Fix issues with dedicated windows in shr.el

[Eli Zaretskii]

branch: master
commit 43e792cd7f752cc0cff5845c5399cab1272670fa
Author: David Bremner <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix issues with dedicated windows in shr.el
    
    * lisp/net/shr.el (shr-pixel-buffer-width, shr-render-td-1): Make
    the window not dedicated, to avoid errors if it was, before
    setting its buffer temporarily.  (Bug#25828)
    
    Copyright-paperwork-exempt: yes
---
 lisp/net/shr.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index b7c4828..6ec647e 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -2228,6 +2228,9 @@ flags that control whether to collect or render objects."
     (if (get-buffer-window)
        (car (window-text-pixel-size nil (point-min) (point-max)))
       (save-window-excursion
+        ;; Avoid errors if the selected window is a dedicated one,
+        ;; and they just want to insert a document into it.
+        (set-window-dedicated-p nil nil)
        (set-window-buffer nil (current-buffer))
        (car (window-text-pixel-size nil (point-min) (point-max)))))))
 
@@ -2271,6 +2274,9 @@ flags that control whether to collect or render objects."
            (shr-indentation 0))
        (shr-descend dom))
       (save-window-excursion
+        ;; Avoid errors if the selected window is a dedicated one,
+        ;; and they just want to insert a document into it.
+        (set-window-dedicated-p nil nil)
        (set-window-buffer nil (current-buffer))
        (unless fill
          (setq natural-width