diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-10-17 15:09:50 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-23 14:54:10 +0300 |
| commit | 0a59c969cc2850940f0791ce2944fa7f4ee3de02 (patch) | |
| tree | 506971a044cdfd63763a08740d4299d570819209 /src | |
| parent | 642a07ce2770428e5114200b4292f5a76bb90fa2 (diff) | |
| download | rneovim-0a59c969cc2850940f0791ce2944fa7f4ee3de02.tar.gz rneovim-0a59c969cc2850940f0791ce2944fa7f4ee3de02.tar.bz2 rneovim-0a59c969cc2850940f0791ce2944fa7f4ee3de02.zip | |
option: Use proper printexpr
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 7000fc4067..13ac1503d5 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -570,12 +570,25 @@ void set_init_1(void) #if defined(MSWIN) || defined(MAC) /* Set print encoding on platforms that don't default to latin1 */ - set_string_default("penc", "hp-roman8", false); + set_string_default("printencoding", "hp-roman8", false); #endif - /* 'printexpr' must be allocated to be able to evaluate it. */ - set_string_default("pexpr", "system('lpr' . (&printdevice == '' ? '' : ' -P' . &printdevice) . ' ' . v:fname_in) . delete(v:fname_in) + v:shell_error", false); - + // 'printexpr' must be allocated to be able to evaluate it. + set_string_default("printexpr", +#ifdef UNIX + "system(['lpr'] " + "+ (empty(&printdevice)?[]:['-P', &printdevice]) " + "+ [v:fname_in])" + ". delete(v:fname_in)" + "+ v:shell_error", +#elif defined(MSWIN) + "system(['copy', v:fname_in, " + "empty(&printdevice)?'LPT1':&printdevice])" + ". delete(v:fname_in)", +#else + "", +#endif + false); set_string_default("viewdir", stdpaths_user_data_subpath("view"), true); set_string_default("backupdir", stdpaths_user_data_subpath("backup"), true); |