[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 7c6f7dc: Simplify string-pixel-width
From: |
Lars Ingebrigtsen |
Subject: |
master 7c6f7dc: Simplify string-pixel-width |
Date: |
Wed, 27 Oct 2021 10:50:48 -0400 (EDT) |
branch: master
commit 7c6f7dc99bc036639bd1b64b412e8c3d3e0c044c
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
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).
---
lisp/emacs-lisp/subr-x.el | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 6f01209..f206081 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 7c6f7dc: Simplify string-pixel-width,
Lars Ingebrigtsen <=