summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/emacs-lisp/subr-x.el18
1 files changed, 6 insertions, 12 deletions
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 6f01209574d..f2060814f25 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -447,18 +447,12 @@ is inserted before adjusting the number of empty lines."
(with-temp-buffer
(insert string)
(save-window-excursion
- (let ((dedicated (window-dedicated-p)))
- ;; Avoid errors if the selected window is a dedicated one,
- ;; and they just want to insert a document into it.
- (unwind-protect
- (progn
- (when dedicated
- (set-window-dedicated-p nil nil))
- (set-window-buffer nil (current-buffer))
- (car (window-text-pixel-size
- nil (line-beginning-position) (point))))
- (when dedicated
- (set-window-dedicated-p nil dedicated)))))))
+ ;; 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))))))
(provide 'subr-x)