# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1714150803 -7200
# Node ID f5ebd5ee3d53e1d59de8a85a8fbdc8db52af3dfc
# Parent  37944a1bc5bfffa31ef78c41151d13ab44308011
patch 9.1.0374: wrong botline in BufEnter

Commit: https://github.com/vim/vim/commit/eb80b8304efb6dfeaa8d01dd41fe281df4894240
Author: Jaehwang Jung <tomtomjhj@gmail.com>
Date:   Fri Apr 26 18:48:48 2024 +0200

    patch 9.1.0374: wrong botline in BufEnter

    Problem:  When :edit an existing buffer, line('w$') may return a
              wrong result.
    Solution: Reset w_valid in curwin_init() (Jaehwang Jung)

    `do_ecmd()` reinitializes the current window (`curwin_init()`) whose
    `w_valid` field may have `VALID_BOTLINE` set. Resetting `w_botline`
    without marking it as invalid makes subsequent `validate_botline()`
    calls a no-op, thus resulting in wrong `line('w$')` value.

    closes: #14642

    Signed-off-by: Jaehwang Jung <tomtomjhj@gmail.com>
    Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -4679,4 +4679,16 @@ func Test_SwapExists_set_other_buf_modif
   bwipe!
 endfunc
 
+func Test_BufEnter_botline()
+  set hidden
+  call writefile(range(10), 'Xxx1', 'D')
+  call writefile(range(20), 'Xxx2', 'D')
+  edit Xxx1
+  edit Xxx2
+  au BufEnter Xxx1 call assert_true(line('w$') > 1)
+  edit Xxx1
+  au! BufEnter Xxx1
+  set hidden&vim
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    374,
+/**/
     373,
 /**/
     372,
diff --git a/src/vim.h b/src/vim.h
--- a/src/vim.h
+++ b/src/vim.h
@@ -656,8 +656,8 @@ extern int (*dyn_libintl_wputenv)(const 
 #define VALID_VIRTCOL	0x04	// w_virtcol (file col) is valid
 #define VALID_CHEIGHT	0x08	// w_cline_height and w_cline_folded valid
 #define VALID_CROW	0x10	// w_cline_row is valid
-#define VALID_BOTLINE	0x20	// w_botine and w_empty_rows are valid
-#define VALID_BOTLINE_AP 0x40	// w_botine is approximated
+#define VALID_BOTLINE	0x20	// w_botline and w_empty_rows are valid
+#define VALID_BOTLINE_AP 0x40	// w_botline is approximated
 #define VALID_TOPLINE	0x80	// w_topline is valid (for cursor position)
 
 // Values for w_popup_flags.
diff --git a/src/window.c b/src/window.c
--- a/src/window.c
+++ b/src/window.c
@@ -2475,6 +2475,7 @@ win_init_empty(win_T *wp)
     wp->w_topfill = 0;
 #endif
     wp->w_botline = 2;
+    wp->w_valid = 0;
 #if defined(FEAT_SYN_HL) || defined(FEAT_SPELL)
     wp->w_s = &wp->w_buffer->b_s;
 #endif