From f624b283bfcea8ab11ff4cf327d2999daf0d66d2 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 18 Jul 2023 21:06:30 +0300 Subject: [PATCH 1/2] 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; } From dec15620d8c79d41808de9a5cbf6ad08f7399212 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Tue, 18 Jul 2023 14:07:03 -0700 Subject: [PATCH 2/2] ; * etc/NEWS (Eshell): Fix typo. --- etc/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index c50f560282a..3117e907125 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -212,7 +212,7 @@ Eshell manual. +++ *** Eshell commands can now be explicitly-remote (or local). By prefixing a command name in Eshell with a remote identifier, like -"/ssh:user@remote:whoami", you can now runs commands on a particular +"/ssh:user@remote:whoami", you can now run commands on a particular host no matter your current directory. Likewise, you can run a command on your local system no matter your current directory via "/:whoami". For more information, see the "(eshell) Remote Access"