aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-10-17 10:21:40 -0400
committerGitHub <noreply@github.com>2021-10-17 10:21:40 -0400
commit77e6ecf85aa756ebca4548e4cfbc906bf8fff568 (patch)
treecbbaf43aeb2f221b9c0431c94e73ef38e9c88a9f /src/nvim/screen.c
parentd2d30dfabdaacfd53b081354248402c797576482 (diff)
parentb98383a2501007b979e491a13fcb1387f1d9101a (diff)
downloadrneovim-77e6ecf85aa756ebca4548e4cfbc906bf8fff568.tar.gz
rneovim-77e6ecf85aa756ebca4548e4cfbc906bf8fff568.tar.bz2
rneovim-77e6ecf85aa756ebca4548e4cfbc906bf8fff568.zip
Merge pull request #15930 from dundargoc/vim-patch/old-style-c-comments
vim-patch:8.1.2396,8.1.2395,8.1.2394,8.1.2392,8.1.2368,8.1.2388,8.1.2379
Diffstat (limited to 'src/nvim/screen.c')
-rw-r--r--src/nvim/screen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 0bd9dbe0d5..63f3267d8a 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -5164,8 +5164,8 @@ void win_redr_status_matches(expand_T *xp, int num_matches, char_u **matches, in
if (row >= 0) {
if (wild_menu_showing == 0 || wild_menu_showing == WM_LIST) {
if (msg_scrolled > 0) {
- /* Put the wildmenu just above the command line. If there is
- * no room, scroll the screen one line up. */
+ // Put the wildmenu just above the command line. If there is
+ // no room, scroll the screen one line up.
if (cmdline_row == Rows - 1) {
msg_scroll_up(false);
msg_scrolled++;
@@ -7031,8 +7031,8 @@ int showmode(void)
if (VIsual_active) {
char *p;
- /* Don't concatenate separate words to avoid translation
- * problems. */
+ // Don't concatenate separate words to avoid translation
+ // problems.
switch ((VIsual_select ? 4 : 0)
+ (VIsual_mode == Ctrl_V) * 2
+ (VIsual_mode == 'V')) {