diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-12-08 18:23:09 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-12-08 18:23:09 -0500 |
| commit | 8bb7aa329d20cb265d8952c96c84a0e54a5726ab (patch) | |
| tree | 83a0ac7a24243d357c75ee976298901642df92c2 /src/nvim/option_defs.h | |
| parent | 8666a148ccacefe2d574eb2c1f2887b740fe6bfc (diff) | |
| parent | df2eeaeb375a7a7f7cb92586b03d10260d485c90 (diff) | |
| download | rneovim-8bb7aa329d20cb265d8952c96c84a0e54a5726ab.tar.gz rneovim-8bb7aa329d20cb265d8952c96c84a0e54a5726ab.tar.bz2 rneovim-8bb7aa329d20cb265d8952c96c84a0e54a5726ab.zip | |
Merge pull request #1182 from bfredl/clipboard
clipboard: support separate +/* clipboards, linewise copy/paste and add tests
Diffstat (limited to 'src/nvim/option_defs.h')
| -rw-r--r-- | src/nvim/option_defs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 89264f8982..39dfbe8b88 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -317,6 +317,13 @@ EXTERN char_u *p_enc; /* 'encoding' */ EXTERN int p_deco; /* 'delcombine' */ EXTERN char_u *p_ccv; /* 'charconvert' */ EXTERN char_u *p_cedit; /* 'cedit' */ +EXTERN char_u *p_cb; /* 'clipboard' */ +EXTERN unsigned cb_flags; +#ifdef IN_OPTION_C +static char *(p_cb_values[]) = {"unnamed", "unnamedplus", NULL}; +#endif +# define CB_UNNAMED 0x001 +# define CB_UNNAMEDPLUS 0x002 EXTERN long p_cwh; /* 'cmdwinheight' */ EXTERN long p_ch; /* 'cmdheight' */ EXTERN int p_confirm; /* 'confirm' */ @@ -582,7 +589,6 @@ static char *(p_ttym_values[]) = EXTERN char_u *p_udir; /* 'undodir' */ EXTERN long p_ul; /* 'undolevels' */ EXTERN long p_ur; /* 'undoreload' */ -EXTERN int p_unc; /* 'unnamedclip' */ EXTERN long p_uc; /* 'updatecount' */ EXTERN long p_ut; /* 'updatetime' */ EXTERN char_u *p_fcs; /* 'fillchar' */ |