diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-03-05 19:03:37 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-03-05 19:03:37 -0500 |
| commit | a06186de41d4051c0fffbb936ae91238ee6c4169 (patch) | |
| tree | b0bb27feca64e5c1bff821225c642c42bd94122a /src/nvim/misc1.c | |
| parent | 0dd1ad0760ecdbfeef94da4ef33d71e66eab35b3 (diff) | |
| parent | 117bf11e19bc0b23fb8baf79acc44ece9fcc8f2b (diff) | |
| download | rneovim-a06186de41d4051c0fffbb936ae91238ee6c4169.tar.gz rneovim-a06186de41d4051c0fffbb936ae91238ee6c4169.tar.bz2 rneovim-a06186de41d4051c0fffbb936ae91238ee6c4169.zip | |
Merge #2011 'Macro cleanup'
Diffstat (limited to 'src/nvim/misc1.c')
| -rw-r--r-- | src/nvim/misc1.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index bf6443e21e..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 (;; ) { @@ -2955,13 +2949,6 @@ char_u *vim_getenv(char_u *name, int *mustfree) if (p == NULL) { if (p_hf != NULL && vim_strchr(p_hf, '$') == NULL) p = p_hf; -#ifdef USE_EXE_NAME - /* - * Use the name of the executable, obtained from argv[0]. - */ - else - p = exe_name; -#endif if (p != NULL) { /* remove the file name */ pend = path_tail(p); @@ -2970,12 +2957,6 @@ char_u *vim_getenv(char_u *name, int *mustfree) if (p == p_hf) pend = remove_tail(p, pend, (char_u *)"doc"); -#ifdef USE_EXE_NAME - /* remove "src/" from exe_name, if present */ - if (p == exe_name) - pend = remove_tail(p, pend, (char_u *)"src"); -#endif - /* for $VIM, remove "runtime/" or "vim54/", if present */ if (!vimruntime) { pend = remove_tail(p, pend, (char_u *)RUNTIME_DIRNAME); @@ -2995,13 +2976,6 @@ char_u *vim_getenv(char_u *name, int *mustfree) free(p); p = NULL; } else { -#ifdef USE_EXE_NAME - /* may add "/vim54" or "/runtime" if it exists */ - if (vimruntime && (pend = vim_version_dir(p)) != NULL) { - free(p); - p = pend; - } -#endif *mustfree = TRUE; } } |