patch 9.1.1288: Using wrong window in ll_resize_stack()

Problem:  Using wrong window in ll_resize_stack()
          (after v9.1.1287)
Solution: Use "wp" instead of "curwin", even though they are always the
          same value.  Fix typos in documentation (zeertzjq).

closes: #17080

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f90a335d60898e716a80937c5c6f453a3b038edc..8530196aa36124b8168fbf1ca716bc8ffa0a4872 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*  For Vim version 9.1.  Last change: 2025 Apr 07
+*options.txt*  For Vim version 9.1.  Last change: 2025 Apr 08
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -5341,13 +5341,12 @@ A jump table for the options with a short description can be found at |Q_op|.
                        local to window
                        {only available when compiled with the |+quickfix|
                        feature}
-       Like 'chistory', but for the location list stack associated with the
-       current window.  If the option is changed in either the location list
-       window itself or the the window that is associated with the location
-       list stack, the new value will also be applied to the other one.  This
-       means this value will always be the same for a given location list
-       window and its corresponding window.  See |quickfix-stack| for
-       additional info.
+       Like 'chistory', but for the location list stack associated with a
+       window.  If the option is changed in either the location list window
+       itself or the window that is associated with the location list stack,
+       the new value will also be applied to the other one.  This means this
+       value will always be the same for a given location list window and its
+       corresponding window.  See |quickfix-stack| for additional info.
 
                        *'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'*
 'linebreak' 'lbr'      boolean (default off)

diff --git a/src/quickfix.c b/src/quickfix.c
index decc01b413ef446939d73118af377d8a6c4d867b..2b12fb5ec13c76afb2bd8c26a5046d896f194839 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2102,7 +2102,7 @@ qf_free_list_stack_items(qf_info_T *qi)
 }
 
 /*
- * Free a qf_ifo_T struct completely
+ * Free a qf_info_T struct completely
  */
     static void
 qf_free_lists(qf_info_T *qi)
@@ -2365,9 +2365,9 @@ qf_resize_stack(int n)
     int
 ll_resize_stack(win_T *wp, int n)
 {
-    // check if current window is a location list window;
+    // check if given window is a location list window;
     // if so then sync its 'lhistory' to the parent window or vice versa
-    if (IS_LL_WINDOW(curwin))
+    if (IS_LL_WINDOW(wp))
        qf_sync_llw_to_win(wp);
     else
        qf_sync_win_to_llw(wp);
@@ -2499,8 +2499,6 @@ qf_alloc_stack(qfltype_T qfltype, int n)
 
 /*
  * Allocate memory for qf_lists member of qf_info_T struct.
- * 'actual' is the actual amount of lists that have been allocated for
- * (only set when function returns sucessfully)
  */
     static qf_list_T *
 qf_alloc_list_stack(int n)

diff --git a/src/version.c b/src/version.c
index 62b1cf770c90cb8af3abf99701570509c847a597..c9bcdcaaf951c07bf36b22edb5f775caba96781e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1288,
 /**/
     1287,
 /**/