diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-07-31 21:50:45 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-07-31 21:50:45 +0300 |
| commit | 0c29f53ab8723dd5a9f31ce8a6e913cc08132e56 (patch) | |
| tree | a3dab726997921ae0a1e8f7bdf7d4479605a39ee | |
| parent | 7bbd7cae0748958a623f23637b95a6fc9debb8b7 (diff) | |
| download | emacs-0c29f53ab8723dd5a9f31ce8a6e913cc08132e56.tar.gz emacs-0c29f53ab8723dd5a9f31ce8a6e913cc08132e56.tar.bz2 emacs-0c29f53ab8723dd5a9f31ce8a6e913cc08132e56.zip | |
Fix 'string-pixel-width' under 'line-prefix'
* lisp/emacs-lisp/subr-x.el (string-pixel-width): Disable
'line-prefix' and 'wrap-prefix' to avoid their effect on the
calculated string width. (Bug#64971)
| -rw-r--r-- | lisp/emacs-lisp/subr-x.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el index 8cdbdf1ef6a..b164071763b 100644 --- a/lisp/emacs-lisp/subr-x.el +++ b/lisp/emacs-lisp/subr-x.el @@ -322,12 +322,15 @@ as the new values of the bound variables in the recursive invocation." ;; Keeping a work buffer around is more efficient than creating a ;; new temporary buffer. (with-current-buffer (get-buffer-create " *string-pixel-width*") - ;; `display-line-numbers-mode' is enabled in internal buffers - ;; that breaks width calculation, so need to disable (bug#59311) + ;; If `display-line-numbers-mode' is enabled in internal + ;; buffers, it breaks width calculation, so disable it (bug#59311) (when (bound-and-true-p display-line-numbers-mode) (display-line-numbers-mode -1)) (delete-region (point-min) (point-max)) - (insert string) + ;; Disable line-prefix and wrap-prefix, for the same reason. + (setq line-prefix nil + wrap-prefix nil) + (insert (propertize string 'line-prefix nil 'wrap-prefix nil)) (car (buffer-text-pixel-size nil nil t))))) ;;;###autoload |