From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 27 Oct 2021 14:50:40 +0000 (+0200)
Subject: Simplify string-pixel-width
X-Git-Tag: emacs-29.0.90~3671^2~383
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7c6f7dc99bc036639bd1b64b412e8c3d3e0c044c;p=emacs.git

Simplify string-pixel-width

* lisp/emacs-lisp/subr-x.el (string-pixel-width): Simplify --
save-window-excursion saves dedication status (and the code was
buggy).
---

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)