mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
globals: KeyTyped is bool
This commit is contained in:
parent
20354dbd75
commit
db90c0c9bf
@ -4395,7 +4395,7 @@ void ex_help(exarg_T *eap)
|
|||||||
buf_T *buf;
|
buf_T *buf;
|
||||||
int len;
|
int len;
|
||||||
char_u *lang;
|
char_u *lang;
|
||||||
int old_KeyTyped = KeyTyped;
|
const bool old_KeyTyped = KeyTyped;
|
||||||
|
|
||||||
if (eap != NULL) {
|
if (eap != NULL) {
|
||||||
/*
|
/*
|
||||||
|
@ -400,7 +400,7 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
|
|||||||
*/
|
*/
|
||||||
if (!(flags & DOCMD_KEYTYPED)
|
if (!(flags & DOCMD_KEYTYPED)
|
||||||
&& !getline_equal(fgetline, cookie, getexline))
|
&& !getline_equal(fgetline, cookie, getexline))
|
||||||
KeyTyped = FALSE;
|
KeyTyped = false;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Continue executing command lines:
|
* Continue executing command lines:
|
||||||
@ -973,7 +973,7 @@ static char_u *get_loop_line(int c, void *cookie, int indent)
|
|||||||
return line;
|
return line;
|
||||||
}
|
}
|
||||||
|
|
||||||
KeyTyped = FALSE;
|
KeyTyped = false;
|
||||||
++cp->current_line;
|
++cp->current_line;
|
||||||
wp = (wcmd_T *)(cp->lines_gap->ga_data) + cp->current_line;
|
wp = (wcmd_T *)(cp->lines_gap->ga_data) + cp->current_line;
|
||||||
sourcing_lnum = wp->lnum;
|
sourcing_lnum = wp->lnum;
|
||||||
|
@ -623,7 +623,7 @@ static int command_line_execute(VimState *state, int key)
|
|||||||
}
|
}
|
||||||
s->wim_index = 0;
|
s->wim_index = 0;
|
||||||
if (p_wmnu && wild_menu_showing != 0) {
|
if (p_wmnu && wild_menu_showing != 0) {
|
||||||
int skt = KeyTyped;
|
const bool skt = KeyTyped;
|
||||||
int old_RedrawingDisabled = RedrawingDisabled;
|
int old_RedrawingDisabled = RedrawingDisabled;
|
||||||
|
|
||||||
if (ccline.input_fn) {
|
if (ccline.input_fn) {
|
||||||
@ -6108,7 +6108,7 @@ static int open_cmdwin(void)
|
|||||||
RedrawingDisabled = i;
|
RedrawingDisabled = i;
|
||||||
restore_batch_count(save_count);
|
restore_batch_count(save_count);
|
||||||
|
|
||||||
int save_KeyTyped = KeyTyped;
|
const bool save_KeyTyped = KeyTyped;
|
||||||
|
|
||||||
/* Trigger CmdwinLeave autocommands. */
|
/* Trigger CmdwinLeave autocommands. */
|
||||||
apply_autocmds(EVENT_CMDWINLEAVE, typestr, typestr, FALSE, curbuf);
|
apply_autocmds(EVENT_CMDWINLEAVE, typestr, typestr, FALSE, curbuf);
|
||||||
|
@ -6707,7 +6707,7 @@ static bool apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io,
|
|||||||
proftime_T wait_time;
|
proftime_T wait_time;
|
||||||
bool did_save_redobuff = false;
|
bool did_save_redobuff = false;
|
||||||
save_redo_T save_redo;
|
save_redo_T save_redo;
|
||||||
const int save_KeyTyped = KeyTyped;
|
const bool save_KeyTyped = KeyTyped;
|
||||||
|
|
||||||
// Quickly return if there are no autocommands for this event or
|
// Quickly return if there are no autocommands for this event or
|
||||||
// autocommands are blocked.
|
// autocommands are blocked.
|
||||||
|
@ -2883,7 +2883,6 @@ static void foldlevelExpr(fline_T *flp)
|
|||||||
int n;
|
int n;
|
||||||
int c;
|
int c;
|
||||||
linenr_T lnum = flp->lnum + flp->off;
|
linenr_T lnum = flp->lnum + flp->off;
|
||||||
int save_keytyped;
|
|
||||||
|
|
||||||
win = curwin;
|
win = curwin;
|
||||||
curwin = flp->wp;
|
curwin = flp->wp;
|
||||||
@ -2898,7 +2897,7 @@ static void foldlevelExpr(fline_T *flp)
|
|||||||
|
|
||||||
/* KeyTyped may be reset to 0 when calling a function which invokes
|
/* KeyTyped may be reset to 0 when calling a function which invokes
|
||||||
* do_cmdline(). To make 'foldopen' work correctly restore KeyTyped. */
|
* do_cmdline(). To make 'foldopen' work correctly restore KeyTyped. */
|
||||||
save_keytyped = KeyTyped;
|
const bool save_keytyped = KeyTyped;
|
||||||
n = (int)eval_foldexpr(flp->wp->w_p_fde, &c);
|
n = (int)eval_foldexpr(flp->wp->w_p_fde, &c);
|
||||||
KeyTyped = save_keytyped;
|
KeyTyped = save_keytyped;
|
||||||
|
|
||||||
|
@ -1670,7 +1670,7 @@ static int vgetorpeek(int advance)
|
|||||||
}
|
}
|
||||||
if (c != NUL && !got_int) {
|
if (c != NUL && !got_int) {
|
||||||
if (advance) {
|
if (advance) {
|
||||||
// KeyTyped = FALSE; When the command that stuffed something
|
// KeyTyped = false; When the command that stuffed something
|
||||||
// was typed, behave like the stuffed command was typed.
|
// was typed, behave like the stuffed command was typed.
|
||||||
// needed for CTRL-W CTRL-] to open a fold, for example.
|
// needed for CTRL-W CTRL-] to open a fold, for example.
|
||||||
KeyStuffed = true;
|
KeyStuffed = true;
|
||||||
|
@ -789,7 +789,7 @@ EXTERN int ex_normal_busy INIT(= 0); // recursiveness of ex_normal()
|
|||||||
EXTERN int ex_normal_lock INIT(= 0); // forbid use of ex_normal()
|
EXTERN int ex_normal_lock INIT(= 0); // forbid use of ex_normal()
|
||||||
EXTERN int ignore_script INIT(= false); // ignore script input
|
EXTERN int ignore_script INIT(= false); // ignore script input
|
||||||
EXTERN int stop_insert_mode; // for ":stopinsert" and 'insertmode'
|
EXTERN int stop_insert_mode; // for ":stopinsert" and 'insertmode'
|
||||||
EXTERN int KeyTyped; // TRUE if user typed current char
|
EXTERN bool KeyTyped; // true if user typed current char
|
||||||
EXTERN int KeyStuffed; // TRUE if current char from stuffbuf
|
EXTERN int KeyStuffed; // TRUE if current char from stuffbuf
|
||||||
EXTERN int maptick INIT(= 0); // tick for each non-mapped char
|
EXTERN int maptick INIT(= 0); // tick for each non-mapped char
|
||||||
|
|
||||||
|
@ -6294,7 +6294,7 @@ static void nv_gomark(cmdarg_T *cap)
|
|||||||
pos_T *pos;
|
pos_T *pos;
|
||||||
int c;
|
int c;
|
||||||
pos_T old_cursor = curwin->w_cursor;
|
pos_T old_cursor = curwin->w_cursor;
|
||||||
int old_KeyTyped = KeyTyped; /* getting file may reset it */
|
const bool old_KeyTyped = KeyTyped; // getting file may reset it
|
||||||
|
|
||||||
if (cap->cmdchar == 'g')
|
if (cap->cmdchar == 'g')
|
||||||
c = cap->extra_char;
|
c = cap->extra_char;
|
||||||
@ -6331,7 +6331,7 @@ static void nv_pcmark(cmdarg_T *cap)
|
|||||||
{
|
{
|
||||||
pos_T *pos;
|
pos_T *pos;
|
||||||
linenr_T lnum = curwin->w_cursor.lnum;
|
linenr_T lnum = curwin->w_cursor.lnum;
|
||||||
int old_KeyTyped = KeyTyped; /* getting file may reset it */
|
const bool old_KeyTyped = KeyTyped; // getting file may reset it
|
||||||
|
|
||||||
if (!checkclearopq(cap->oap)) {
|
if (!checkclearopq(cap->oap)) {
|
||||||
if (cap->cmdchar == 'g')
|
if (cap->cmdchar == 'g')
|
||||||
|
@ -1759,7 +1759,7 @@ void qf_jump(qf_info_T *qi, int dir, int errornr, int forceit)
|
|||||||
win_T *oldwin = curwin;
|
win_T *oldwin = curwin;
|
||||||
int print_message = TRUE;
|
int print_message = TRUE;
|
||||||
int len;
|
int len;
|
||||||
int old_KeyTyped = KeyTyped; /* getting file may reset it */
|
const bool old_KeyTyped = KeyTyped; // getting file may reset it
|
||||||
int ok = OK;
|
int ok = OK;
|
||||||
bool usable_win;
|
bool usable_win;
|
||||||
|
|
||||||
@ -2932,7 +2932,7 @@ static void qf_fill_buffer(qf_info_T *qi, buf_T *buf, qfline_T *old_last)
|
|||||||
qfline_T *qfp;
|
qfline_T *qfp;
|
||||||
buf_T *errbuf;
|
buf_T *errbuf;
|
||||||
int len;
|
int len;
|
||||||
int old_KeyTyped = KeyTyped;
|
const bool old_KeyTyped = KeyTyped;
|
||||||
|
|
||||||
if (old_last == NULL) {
|
if (old_last == NULL) {
|
||||||
if (buf != curbuf) {
|
if (buf != curbuf) {
|
||||||
|
@ -267,7 +267,7 @@ do_tag (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (type == DT_POP) { /* go to older position */
|
if (type == DT_POP) { /* go to older position */
|
||||||
int old_KeyTyped = KeyTyped;
|
const bool old_KeyTyped = KeyTyped;
|
||||||
if ((tagstackidx -= count) < 0) {
|
if ((tagstackidx -= count) < 0) {
|
||||||
EMSG(_(bottommsg));
|
EMSG(_(bottommsg));
|
||||||
if (tagstackidx + count == 0) {
|
if (tagstackidx + count == 0) {
|
||||||
@ -2333,7 +2333,7 @@ static int jumpto_tag(
|
|||||||
int save_no_hlsearch;
|
int save_no_hlsearch;
|
||||||
win_T *curwin_save = NULL;
|
win_T *curwin_save = NULL;
|
||||||
char_u *full_fname = NULL;
|
char_u *full_fname = NULL;
|
||||||
int old_KeyTyped = KeyTyped; /* getting the file may reset it */
|
const bool old_KeyTyped = KeyTyped; // getting the file may reset it
|
||||||
const int l_g_do_tagpreview = g_do_tagpreview;
|
const int l_g_do_tagpreview = g_do_tagpreview;
|
||||||
const size_t len = matching_line_len(lbuf_arg) + 1;
|
const size_t len = matching_line_len(lbuf_arg) + 1;
|
||||||
char_u *lbuf = xmalloc(len);
|
char_u *lbuf = xmalloc(len);
|
||||||
|
Loading…
Reference in New Issue
Block a user