Mercurial > vim
view src/os_vms_mms.c @ 34094:0b25a862bf0c v9.1.0014
patch 9.1.0014: incorrect use of W_WINROW in edit.c
Commit: https://github.com/vim/vim/commit/b1ed7ec9f7d1a0142d4f1c8c83bab9172bc92c7c
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Jan 5 18:11:43 2024 +0100
patch 9.1.0014: incorrect use of W_WINROW in edit.c
Problem: incorrect use of W_WINROW in edit.c
Solution: compare against curwin->w_height instead
Remove incorrect use of W_WINROW
In structs.h it is mentioned that w_wrow is relative to w_winrow, so
using W_WINROW doesn't make sense when comparing with window height.
This change won't lead to any observable behavior change:
The condition intends to check if there are 'scrolloff' lines between
the current cursor when the bottom of the window. When W_WINROW(curwin)
is added to curwin->w_height - 1 - get_scrolloff_value(), the condition
is instead satisfied when the cursor is on some screen line below that
position. However,
- If 'scrolloff' is smaller than half the window height, this condition
can only be satisfied when W_WINROW(curwin) == 0. And if it is not
satisfied, update_topline() does the actual scrolling.
- If 'scrolloff' is larger than half the window height, update_topline()
will put the cursor at the center of the window soon afterwards
anyway, because set_topline() now unsets VALID_TOPLINE flag starting
from https://github.com/vim/vim-history/commit/7db7bb45b0f919ff0615d463ebd4fde881c69d1f.
To put it in another way, https://github.com/vim/vim-history/commit/7db7bb45b0f919ff0615d463ebd4fde881c69d1f
makes the update_topline() just below correct the mistakes made in this
block, so this incorrect use of W_WINROW() no longer affects observable
behavior.
closes: #12331
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 05 Jan 2024 18:30:03 +0100 |
parents | 2463194c8cdd |
children |
line wrap: on
line source
#include <stdio.h> #include <stdlib.h> #include <string.h> #include <unixio.h> #include "vim.h" int main(int argc, char *argv[]) { FILE *fpi, *fpo; char cmd[132], buf[BUFSIZ], *argp, *error_file, target[132], *mms; int err = 0, err_line = 0; mms = "mms"; argc--; argv++; while (argc-- > 0) { argp = *argv++; if (*argp == '-') { switch (*++argp) { case 'm': mms = ++argp; break; case 'e': if (!*(error_file = ++argp)) { error_file = *argv++; argc--; } break; default: break; } } else { if (*target) strcat(target, " "); strcat(target, argp); } } vim_snprintf(cmd, sizeof(cmd), "%s/output=tmp:errors.vim_tmp %s", mms, target); system(cmd); fpi = fopen("tmp:errors.vim_tmp", "r"); fpo = fopen(error_file, "w"); while (fgets(buf, BUFSIZ, fpi)) { if (!memcmp(buf, "%CC-", 4)) { err_line++; buf[strlen(buf)-1] = '\0'; err++; } else { if (err_line) { if (strstr(buf, _("At line"))) { err_line = 0; fprintf(fpo, "@"); } else buf[strlen(buf)-1] = '\0'; } } fprintf(fpo, "%s", buf); } fclose(fpi); fclose(fpo); while (!delete("tmp:errors.vim_tmp")) /*nop*/; exit(err ? 44 : 1); return(0); }