diff options
author | Martin Tournoij <martin@arp242.net> | 2022-10-04 16:28:45 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-10-04 16:28:45 +0100 |
commit | 7904fa420eb577274c4c3711295240100167d495 (patch) | |
tree | a38ab30cb4c947c2ebba45cd7ed711ffd2e719a7 /src/ex_getln.c | |
parent | 4ba5f1dab656103e8f4a4505452d1816b9e83c1e (diff) |
patch 9.0.0657: too many #ifdefsv9.0.0657
Problem: Too many #ifdefs.
Solution: Graduate the +cmdwin feature. Now the tiny and small builds are
equal, drop the small build. (Martin Tournoij, closes #11268)
Diffstat (limited to 'src/ex_getln.c')
-rw-r--r-- | src/ex_getln.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 02205814d9..770daa9525 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -52,16 +52,12 @@ static void restore_cmdline(cmdline_info_T *ccp); static int cmdline_paste(int regname, int literally, int remcr); static void redrawcmdprompt(void); static int ccheck_abbr(int); +static int open_cmdwin(void); #ifdef FEAT_SEARCH_EXTRA static int empty_pattern_magic(char_u *pat, size_t len, magic_T magic_val); #endif -#ifdef FEAT_CMDWIN -static int open_cmdwin(void); - static int cedit_key = -1; // key value of 'cedit' option -#endif - static void trigger_cmd_autocmd(int typechar, int evt) @@ -1922,7 +1918,6 @@ getcmdline_int( // cmdline_handle_backslash_key() } -#ifdef FEAT_CMDWIN if (c == cedit_key || c == K_CMDWIN) { // TODO: why is ex_normal_busy checked here? @@ -1935,11 +1930,8 @@ getcmdline_int( some_key_typed = TRUE; } } -# ifdef FEAT_DIGRAPHS - else -# endif -#endif #ifdef FEAT_DIGRAPHS + else c = do_digraph(c); #endif @@ -2687,10 +2679,8 @@ check_opt_wim(void) int text_locked(void) { -#ifdef FEAT_CMDWIN if (cmdwin_type != 0) return TRUE; -#endif return textlock != 0; } @@ -2707,10 +2697,8 @@ text_locked_msg(void) char * get_text_locked_msg(void) { -#ifdef FEAT_CMDWIN if (cmdwin_type != 0) return e_invalid_in_cmdline_window; -#endif return e_not_allowed_to_change_text_or_change_window; } @@ -4080,7 +4068,6 @@ get_cmdline_info(void) return &ccline; } -#if defined(FEAT_EVAL) || defined(FEAT_CMDWIN) || defined(PROTO) /* * Get pointer to the command line info to use. save_cmdline() may clear * ccline and put the previous value in prev_ccline. @@ -4096,9 +4083,7 @@ get_ccline_ptr(void) return &prev_ccline; return NULL; } -#endif -#if defined(FEAT_EVAL) || defined(FEAT_CMDWIN) /* * Get the current command-line type. * Returns ':' or '/' or '?' or '@' or '>' or '-' @@ -4120,7 +4105,6 @@ get_cmdline_type(void) '-'; return p->cmdfirstc; } -#endif #if defined(FEAT_EVAL) || defined(PROTO) /* @@ -4365,7 +4349,6 @@ get_list_range(char_u **str, int *num1, int *num2) return OK; } -#if defined(FEAT_CMDWIN) || defined(PROTO) /* * Check value of 'cedit' and set cedit_key. * Returns NULL if value is OK, error message otherwise. @@ -4694,7 +4677,6 @@ is_in_cmdwin(void) { return cmdwin_type != 0 && get_cmdline_type() == NUL; } -#endif // FEAT_CMDWIN /* * Used for commands that either take a simple command string argument, or: |