Mercurial > vim
changeset 30355:c0be6563fa39 v9.0.0513
patch 9.0.0513: may not be able to use a pattern ad the debug prompt
Commit: https://github.com/vim/vim/commit/9781d9c00517a67c44b50b040cca2c5804daf15c
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Sep 20 13:51:25 2022 +0100
patch 9.0.0513: may not be able to use a pattern ad the debug prompt
Problem: May not be able to use a pattern ad the debug prompt.
Solution: Temporarily disable the timeout. (closes https://github.com/vim/vim/issues/11164)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 20 Sep 2022 15:00:04 +0200 |
| parents | 7d342e8f916d |
| children | 886ccc911b6b |
| files | src/debugger.c src/proto/regexp.pro src/regexp.c src/version.c |
| diffstat | 4 files changed, 34 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/debugger.c +++ b/src/debugger.c @@ -87,6 +87,7 @@ do_debug(char_u *cmd) msg_silent = FALSE; // display messages emsg_silent = FALSE; // display error messages redir_off = TRUE; // don't redirect debug commands + save_timeout_for_debugging(); // disable regexp timeout flag State = MODE_NORMAL; debug_mode = TRUE; @@ -293,6 +294,7 @@ do_debug(char_u *cmd) redraw_all_later(UPD_NOT_VALID); need_wait_return = FALSE; msg_scroll = save_msg_scroll; + restore_timeout_for_debugging(); lines_left = Rows - 1; State = save_State; debug_mode = FALSE;
--- a/src/proto/regexp.pro +++ b/src/proto/regexp.pro @@ -1,6 +1,8 @@ /* regexp.c */ void init_regexp_timeout(long msec); void disable_regexp_timeout(void); +void save_timeout_for_debugging(void); +void restore_timeout_for_debugging(void); int re_multiline(regprog_T *prog); char_u *skip_regexp(char_u *startp, int delim, int magic); char_u *skip_regexp_err(char_u *startp, int delim, int magic);
--- a/src/regexp.c +++ b/src/regexp.c @@ -80,6 +80,34 @@ disable_regexp_timeout(void) } #endif +#if defined(FEAT_EVAL) || defined(PROTO) +# ifdef FEAT_RELTIME +static sig_atomic_t *saved_timeout_flag; +# endif + +/* + * Used at the debug prompt: disable the timeout so that expression evaluation + * can used patterns. + * Must be followed by calling restore_timeout_for_debugging(). + */ + void +save_timeout_for_debugging(void) +{ +# ifdef FEAT_RELTIME + saved_timeout_flag = (sig_atomic_t *)timeout_flag; + timeout_flag = &dummy_timeout_flag; +# endif +} + + void +restore_timeout_for_debugging(void) +{ +# ifdef FEAT_RELTIME + timeout_flag = saved_timeout_flag; +# endif +} +#endif + /* * The first byte of the BT regexp internal "program" is actually this magic * number; the start node begins in the second byte. It's used to catch the