aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/edit.c15
-rw-r--r--src/nvim/ex_cmds.c3
-rw-r--r--src/nvim/ex_docmd.c3
-rw-r--r--src/nvim/ex_getln.c9
-rw-r--r--src/nvim/globals.h3
-rw-r--r--src/nvim/message.c3
-rw-r--r--src/nvim/misc1.c6
-rw-r--r--src/nvim/normal.c6
-rw-r--r--src/nvim/window.c3
9 files changed, 0 insertions, 51 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index fcbbc8ab7f..c6716dc870 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -582,9 +582,6 @@ edit (
old_topline = curwin->w_topline;
old_topfill = curwin->w_topfill;
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = FALSE; /* allow scrolling here */
-#endif
/*
* Get a character for Insert mode. Ignore K_IGNORE.
@@ -4701,9 +4698,6 @@ int get_literal(void)
if (got_int)
return Ctrl_C;
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
++no_mapping; /* don't map the next key hits */
cc = 0;
i = 0;
@@ -4962,9 +4956,6 @@ insertchar (
* Don't do this when there an InsertCharPre autocommand is defined,
* because we need to fire the event for every character.
*/
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = FALSE; /* allow scrolling here */
-#endif
if ( !ISSPECIAL(c)
&& (!has_mbyte || (*mb_char2len)(c) == 1)
@@ -6729,9 +6720,6 @@ static void ins_reg(void)
add_to_showcmd_c(Ctrl_R);
}
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
/*
* Don't map the register name. This also prevents the mode message to be
@@ -8056,9 +8044,6 @@ static int ins_digraph(void)
add_to_showcmd_c(Ctrl_K);
}
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
/* don't map the digraph chars. This also prevents the
* mode message to be deleted when ESC is hit */
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 2d6ef5ef17..afa397976b 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -3949,9 +3949,6 @@ void do_sub(exarg_T *eap)
ui_cursor_goto(msg_row, msg_col);
RedrawingDisabled = temp;
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = FALSE; /* allow scrolling here */
-#endif
++no_mapping; /* don't map this key */
++allow_keys; /* allow special keys */
typed = plain_vgetc();
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 30a3ec40dd..4e835cc43a 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -6607,9 +6607,6 @@ static void ex_at(exarg_T *eap)
curwin->w_cursor.lnum = eap->line2;
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
/* get the register name. No name means to use the previous one */
c = *eap->arg;
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 3dffb1f1d3..a7bb4afa70 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -291,9 +291,6 @@ getcmdline (
redir_off = TRUE; /* Don't redirect the typed command.
Repeated, because a ":redir" inside
completion may switch it on. */
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = FALSE; /* allow scrolling here */
-#endif
quit_more = FALSE; /* reset after CTRL-D which had a more-prompt */
cursorcmd(); /* set the cursor on the right spot */
@@ -904,9 +901,6 @@ getcmdline (
goto returncmd; /* back to cmd mode */
case Ctrl_R: /* insert register */
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
putcmdline('"', TRUE);
++no_mapping;
i = c = plain_vgetc(); /* CTRL-R <char> */
@@ -1270,9 +1264,6 @@ getcmdline (
case Ctrl_K:
ignore_drag_release = TRUE;
putcmdline('?', TRUE);
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
c = get_digraph(TRUE);
if (c != NUL)
break;
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 96c906c2bb..5d52774f40 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -834,9 +834,6 @@ EXTERN int ctrl_x_mode INIT(= 0); /* Which Ctrl-X mode are we in? */
EXTERN int no_abbr INIT(= TRUE); /* TRUE when no abbreviations loaded */
-#ifdef USE_ON_FLY_SCROLL
-EXTERN int dont_scroll INIT(= FALSE); /* don't use scrollbars when TRUE */
-#endif
EXTERN int mapped_ctrl_c INIT(= FALSE); /* CTRL-C is mapped */
EXTERN cmdmod_T cmdmod; /* Ex command modifiers */
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 27619fcc5d..3a68de8881 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -794,9 +794,6 @@ void wait_return(int redraw)
State = HITRETURN;
setmouse();
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
/* Avoid the sequence that the user types ":" at the hit-return prompt
* to start an Ex command, but the file-changed dialog gets in the
* way. */
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 3da666c07c..a836ab5680 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -2290,9 +2290,6 @@ int ask_yesno(char_u *str, int direct)
int save_State = State;
++no_wait_return;
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
State = CONFIRM; /* mouse behaves like with :confirm */
setmouse(); /* disables mouse for xterm */
++no_mapping;
@@ -2465,9 +2462,6 @@ get_number (
if (msg_silent != 0)
return 0;
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
++no_mapping;
++allow_keys; /* no mapping here, but recognize keys */
for (;; ) {
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 3906226b2e..c6250297c1 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -473,9 +473,6 @@ normal_cmd (
mapped_len = typebuf_maplen();
State = NORMAL_BUSY;
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = false; /* allow scrolling here */
-#endif
/* Set v:count here, when called from main() and not a stuffed
* command, so that v:count can be used in an expression mapping
@@ -3607,9 +3604,6 @@ static void nv_zet(cmdarg_T *cap)
return;
n = nchar - '0';
for (;; ) {
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = true; /* disallow scrolling here */
-#endif
++no_mapping;
++allow_keys; /* no mapping for nchar, but allow key codes */
nchar = plain_vgetc();
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 1e8de3ce4f..8b6f925928 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -441,9 +441,6 @@ wingotofile:
case 'g':
case Ctrl_G:
CHECK_CMDWIN
-#ifdef USE_ON_FLY_SCROLL
- dont_scroll = TRUE; /* disallow scrolling here */
-#endif
++ no_mapping;
++allow_keys; /* no mapping for xchar, but allow key codes */
if (xchar == NUL)
generated by cgit (git 2.34.1) at 2025-05-12 08:30:06 +0000