diff options
| author | David Bremner <david@tethera.net> | 2017-03-04 12:19:32 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-03-04 12:19:32 +0200 |
| commit | 43e792cd7f752cc0cff5845c5399cab1272670fa (patch) | |
| tree | 38a3a5671efec2be1690b32a268304c0eb62dabc /lisp/net/shr.el | |
| parent | 69dde0c54ce8d4ae9600bd10fa15b2b1e227c1f3 (diff) | |
| download | emacs-43e792cd7f752cc0cff5845c5399cab1272670fa.tar.gz emacs-43e792cd7f752cc0cff5845c5399cab1272670fa.tar.bz2 emacs-43e792cd7f752cc0cff5845c5399cab1272670fa.zip | |
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
Diffstat (limited to 'lisp/net/shr.el')
| -rw-r--r-- | lisp/net/shr.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index b7c48288494..6ec647e8028 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 |