Mercurial > vim

comparison src/diff.c @ 26771:fc859aea8cec v8.2.3914

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3914: various spelling mistakes in comments Commit: https://github.com/vim/vim/commit/af4a61a85d6e8cacc35324f266934bc463a21673 Author: Dominique Pelle <dominique.pelle@gmail.com> Date: Mon Dec 27 17:21:41 2021 +0000 patch 8.2.3914: various spelling mistakes in comments Problem: Various spelling mistakes in comments. Solution: Fix the mistakes. (Dominique Pell?, closes https://github.com/vim/vim/issues/9416)
author Bram Moolenaar <Bram@vim.org>
date Mon, 27 Dec 2021 18:30:05 +0100
parents fac6673086df
children b802798e4a26
comparison
equal deleted inserted replaced
26770:15ff3f2e0d58 26771:fc859aea8cec
691 } 691 }
692 692
693 if (wp_other != NULL && curwin->w_p_scb) 693 if (wp_other != NULL && curwin->w_p_scb)
694 { 694 {
695 if (used_max_fill_curwin) 695 if (used_max_fill_curwin)
696 // The current window was set to used the maximum number of filler 696 // The current window was set to use the maximum number of filler
697 // lines, may need to reduce them. 697 // lines, may need to reduce them.
698 diff_set_topline(wp_other, curwin); 698 diff_set_topline(wp_other, curwin);
699 else if (used_max_fill_other) 699 else if (used_max_fill_other)
700 // The other window was set to used the maximum number of filler 700 // The other window was set to use the maximum number of filler
701 // lines, may need to reduce them. 701 // lines, may need to reduce them.
702 diff_set_topline(curwin, wp_other); 702 diff_set_topline(curwin, wp_other);
703 } 703 }
704 } 704 }
705 705
1593 curtab->tp_diff_invalid = FALSE; 1593 curtab->tp_diff_invalid = FALSE;
1594 curtab->tp_diff_update = FALSE; 1594 curtab->tp_diff_update = FALSE;
1595 diff_clear(curtab); 1595 diff_clear(curtab);
1596 } 1596 }
1597 1597
1598 // Remove "hor" from from 'scrollopt' if there are no diff windows left. 1598 // Remove "hor" from 'scrollopt' if there are no diff windows left.
1599 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL) 1599 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
1600 do_cmdline_cmd((char_u *)"set sbo-=hor"); 1600 do_cmdline_cmd((char_u *)"set sbo-=hor");
1601 } 1601 }
1602 1602
1603 /* 1603 /*