mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Macro cleanup: USE_EXE_NAME
This commit is contained in:
parent
0925870d0c
commit
cf663588d9
@ -837,10 +837,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_EXE_NAME
|
||||
EXTERN char_u *exe_name; /* the name of the executable */
|
||||
#endif
|
||||
|
||||
#ifdef USE_ON_FLY_SCROLL
|
||||
EXTERN int dont_scroll INIT(= FALSE); /* don't use scrollbars when TRUE */
|
||||
#endif
|
||||
|
@ -2955,13 +2955,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 +2963,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 +2982,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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user