master f624b283bfc: Fix line number display under 'mode-line-format-right-align'

[Eli Zaretskii]

branch: master
commit f624b283bfcea8ab11ff4cf327d2999daf0d66d2
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix line number display under 'mode-line-format-right-align'
    
    * src/xdisp.c (Fbuffer_text_pixel_size): Restore window attributes
    important for redisplay of the target WINDOW.  (Bug#64713)
---
 src/xdisp.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/xdisp.c b/src/xdisp.c
index 5d94dc003f3..3728228c6de 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11651,6 +11651,8 @@ WINDOW.  */)
 
   set_buffer_internal_1 (b);
 
+  ptrdiff_t base_line_pos = w->base_line_pos;
+  int end_valid = w->window_end_valid;
   if (!EQ (buffer, w->contents))
     {
       wset_buffer (w, buffer);
@@ -11663,6 +11665,11 @@ WINDOW.  */)
 
   unbind_to (count, Qnil);
 
+  /* Restore original values.  This is important if this function is
+     called from some ':eval' form in the middle of redisplay.  */
+  w->base_line_pos = base_line_pos;
+  w->window_end_valid = end_valid;
+
   return value;
 }