From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 20 Nov 2016 19:08:47 +0000 (+0200)
Subject: Avoid errors in shr-pixel-column due to dedicated windows
X-Git-Tag: emacs-25.1.90~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a725592;p=emacs.git

Avoid errors in shr-pixel-column due to dedicated windows

* lisp/net/shr.el (shr-pixel-column): If we are switching to
another buffer in the selected window, make that window
temporarily non-dedicated.  (Bug#24950)
---

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 2c8ff79763f..18bc7b86715 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -518,6 +518,9 @@ size, and full-buffer size."
       (current-column)
     (if (not (get-buffer-window (current-buffer)))
 	(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 (line-beginning-position) (point))))
       (car (window-text-pixel-size nil (line-beginning-position) (point))))))