Skip to content

Commit 615c269

Browse files
committed
Merge remote-tracking branch 'macvim/master' into work
Conflicts: .hgtags runtime/syntax/vim.vim src/MacVim/Info.plist src/auto/configure src/config.mk.in src/configure.in src/eval.c src/gui_w32.c src/if_lua.c src/if_py_both.h src/mbyte.c src/memline.c src/regexp_nfa.c src/structs.h src/testdir/Make_dos.mak src/undo.c src/version.c
2 parents 739bff3 + d1424d3 commit 615c269

File tree

4 files changed

+13
-41
lines changed

4 files changed

+13
-41
lines changed

runtime/syntax/vim.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ syn keyword vimCommand contained abo[veleft] arge[dit] au bl[ast] brea[k] bu bw[
2525
syn keyword vimCommand contained al[l] argg[lobal] bad[d] bm[odified] breaka[dd] buf c cal[l] ce[nter] cg[etfile] cl cN cnf[ile] comp[iler] cpf[ile] cstag debugg[reedy] deletel dell diffo[ff] dig dli[st] dsp[lit] echom[sg] en endt[ry] f fina[lly] foldc[lose] fun gui helpf[ind] i imapc[lear] j[oin] kee[pmarks] lad[dexpr] later lcscope lgetb[uffer] l[ist] lN lNf lo[adview] lp[revious] luafile ma[rk] messages mkvie[w] mzf[ile] ne noh[lsearch] on[ly] pe popu[p] pro pta[g] ptn[ext] pw[d] py[thon] r red[o] ret[ab] ru ru[ntime] sav[eas] sbn[ext] scrip se[t] sfir[st] sil[ent] sm[agic] sN[ext] so spe[llgood] sp[lit] star stj[ump] sunme sy t tabe[dit] tabN tabp[revious] tc[l] th[row] tn tp[revious] tu u[ndo] unlo[ckvar] verb[ose] vim[grep] vne[w] win wn[ext] w[rite] xa[ll] xnoreme y[ank]
2626
syn keyword vimCommand contained ar argl[ocal] ba[ll] bn[ext] breakd[el] bufdo cabc[lear] cat[ch] cex[pr] c[hange] cla[st] cnew[er] cNf[ile] con cp[revious] cuna[bbrev] del deletep delm[arks] diffp[atch] dig[raphs] do e echon endf endw[hile] f[ile] fin[d] folddoc[losed] fu[nction] gvim helpg[rep] ia in ju[mps] keepp[atterns] laddf[ile] lb[uffer] le[ft] lgete[xpr] ll lne lnf[ile] loc[kmarks] lr[ewind] lv[imgrep] marks mk mkv[imrc] mz[scheme] new noswap[file] o[pen] ped[it] pp[op] profd[el] ptf[irst] ptN[ext] py python3 re
2727
syn match vimCommand contained "\<z[-+^.=]\=\>"
28+
syn keyword vimCommand contained maca[ction] macm[enu]
2829
syn keyword vimStdPlugin contained DiffOrig Man N[ext] P[rint] S TOhtml XMLent XMLns
2930

3031
" vimOptions are caught only when contained in a vimSet {{{2
@@ -35,6 +36,8 @@ syn keyword vimOption contained al antialias autochdir background balloondelay b
3536
syn keyword vimOption contained aleph ar autoindent backspace ballooneval bg bkc briopt bufhidden cd ci cinw co commentstring confirm cpoptions cscoperelative csre cursorcolumn delcombine diffopt ea efm ep et fdc fdo ffs filetype fo foldlevelstart formatexpr ft gfw gtt guipty hh hkmap ic imaf iminsert includeexpr inf isident key langmap linebreak lm lw mat maxmempattern mis mmt mouse mouseshape mzquantum odev osfiletype patchmode ph preserveindent printheader pvh redrawtime revins ro rulerformat scr sect sft shellredir shiftwidth showmatch siso smc spc spl ss statusline suffixesadd sws tabline tags tbs textmode timeoutlen to tsl ttyfast uc undoreload vdir viewoptions warn wfw wildcharm winaltkeys winwidth wop writedelay
3637
syn keyword vimOption contained allowrevins arab autoread backup balloonexpr bh bl brk buflisted cdpath cin cinwords cocu compatible consk cpt cscopetag cst cursorline dex digraph ead ei equalalways eventignore fde fdt fic fillchars foldclose foldmarker formatlistpat gcr ghr guicursor guitablabel hi hkmapp icon imak ims incsearch infercase isk keymap langmenu lines lmap lz matchpairs maxmemtot mkspellmem mod mousef mouset nf oft pa path pheader previewheight printmbcharset pvw regexpengine ri rop runtimepath scroll sections sh shellslash shm showmode sj smd spell splitbelow ssl stl sw sxe tabpagemax tagstack tenc textwidth title toolbar tsr ttym udf updatecount ve viminfo wb wh wildignore window wiv wrap ws
3738
syn keyword vimOption contained altkeymap arabic autowrite backupcopy bdir bin bomb browsedir buftype cedit cindent clipboard cole complete conskey crb cscopetagorder csto cwh dg dip eadirection ek equalprg ex fdi fen fileencoding fk foldcolumn foldmethod formatoptions gd go guifont guitabtooltip hid hkp iconstring imc imsearch inde insertmode iskeyword keymodel langnoremap linespace lnr ma matchtime mco ml modeline mousefocus mousetime nrformats ofu para pdev pi previewwindow printmbfont qe relativenumber rightleft rs sb scrollbind secure shcf shelltemp shortmess showtabline slm sn spellcapcheck splitright ssop stmp swapfile sxq tabstop tal term tf titlelen toolbariconsize ttimeout ttymouse udir updatetime verbose virtualedit wc whichwrap wildignorecase winfixheight wiw wrapmargin ww
39+
syn keyword vimOption contained altkeymap arabic autowrite backupcopy bdir bin bomb bt ccv charconvert cinoptions cms comments conceallevel cpo cscopequickfix csqf cursorbind define diffexpr dy ef eol esckeys fcs fdn ff fileignorecase fmr foldlevel foldtext fsync gfs gtl guioptions hf hk hlsearch imactivatekey imi include inex isi js kp linebreak lm lz matchpairs maxmemtot mkspellmem mod mousef mouset nf oft pa path pheader previewheight printmbcharset pvw regexpengine rightleft rtp sbo scrolljump sel shell shelltype shortname shq sm so spellfile spr st sts swapsync syn tag tb termbidi tgst titleold top ttimeoutlen ttyscroll ul ur verbosefile visualbell
40+
syn keyword vimOption contained fullscreen fu fuoptions fuopt macmeta mmta transparency transp
3841

3942
" vimOptions: These are the turn-off setting variants {{{2
4043
syn keyword vimOption contained noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobinary nobk nobuflisted nocin noconfirm nocopyindent nocscoperelative nocsre nocuc nocursorcolumn nodelcombine nodigraph noed noendofline noerrorbells noex nofen nofk nogd nohid nohkmap nohkp nohlsearch noicon noim noimcmdline noimdisable noinf noinsertmode nojoinspaces nolazyredraw nolinebreak nolist nolpl noma nomagic noml nomodeline nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw norelativenumber norestorescreen nori norl noro noru nosb noscb noscs nosft noshelltemp noshortname noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx noundofile novisualbell nowarn noweirdinvert nowfw nowildignorecase nowinfixheight nowiv nowrap nowrite nowritebackup

src/MacVim/MacVim.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@
753753
buildSettings = {
754754
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
755755
COPY_PHASE_STRIP = NO;
756-
CURRENT_PROJECT_VERSION = 73;
756+
CURRENT_PROJECT_VERSION = 74;
757757
FRAMEWORK_SEARCH_PATHS = (
758758
"$(inherited)",
759759
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -786,7 +786,7 @@
786786
buildSettings = {
787787
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
788788
COPY_PHASE_STRIP = YES;
789-
CURRENT_PROJECT_VERSION = 73;
789+
CURRENT_PROJECT_VERSION = 74;
790790
FRAMEWORK_SEARCH_PATHS = (
791791
"$(inherited)",
792792
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",

src/auto/configure

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,6 @@ with_gnome_includes
843843
with_gnome_libs
844844
with_gnome
845845
with_motif_lib
846-
enable_uimfep
847846
with_tlib
848847
enable_largefile
849848
enable_acl
@@ -1507,7 +1506,6 @@ Optional Features:
15071506
--enable-carbon-check If auto-select GUI, check for Carbon default=yes
15081507
--enable-macvim-check If auto-select GUI, check for MacVim default=yes
15091508
--disable-gtktest Do not try to compile and run a test GTK program
1510-
--disable-uimfep Don't support UIMFEP.
15111509
--disable-largefile omit support for large files
15121510
--disable-acl Don't check for ACL support.
15131511
--disable-gpm Don't use gpm (Linux mouse daemon).
@@ -5845,15 +5843,6 @@ $as_echo "OK" >&6; }
58455843
vi_cv_perllib=`$vi_cv_path_perl -MConfig -e 'print $Config{privlibexp}'`
58465844
vi_cv_perlsitelib=`$vi_cv_path_perl -MConfig -e 'print $Config{sitelibexp}'`
58475845

5848-
5849-
vi_cv_perl_extutils=unknown_perl_extutils_path
5850-
for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do
5851-
xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp"
5852-
if test -f "$xsubpp_path"; then
5853-
vi_cv_perl_xsubpp="$xsubpp_path"
5854-
fi
5855-
done
5856-
58575846
vi_cv_perl_extutils=unknown_perl_extutils_path
58585847
for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do
58595848
xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp"
@@ -9974,26 +9963,6 @@ $as_echo "no GUI selected; hangul input has been disabled" >&6; }
99749963
fi
99759964
fi
99769965

9977-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-uimfep argument" >&5
9978-
$as_echo_n "checking --disable-uimfep argument... " >&6; }
9979-
# Check whether --enable-uimfep was given.
9980-
if test "${enable_uimfep+set}" = set; then :
9981-
enableval=$enable_uimfep;
9982-
else
9983-
enable_uimfep="yes"
9984-
fi
9985-
9986-
if test "$enable_uimfep" = "yes"; then
9987-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9988-
$as_echo "no" >&6; }
9989-
$as_echo "#define FEAT_UIMFEP 1" >>confdefs.h
9990-
9991-
else
9992-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9993-
$as_echo "yes" >&6; }
9994-
fi
9995-
9996-
99979966

99989967
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether toupper is broken" >&5
99999968
$as_echo_n "checking whether toupper is broken... " >&6; }
@@ -11933,7 +11902,7 @@ else
1193311902
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1193411903
since some C++ compilers masquerading as C compilers
1193511904
incorrectly reject 9223372036854775807. */
11936-
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
11905+
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
1193711906
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1193811907
&& LARGE_OFF_T % 2147483647 == 1)
1193911908
? 1 : -1];
@@ -11979,7 +11948,7 @@ else
1197911948
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1198011949
since some C++ compilers masquerading as C compilers
1198111950
incorrectly reject 9223372036854775807. */
11982-
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
11951+
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
1198311952
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1198411953
&& LARGE_OFF_T % 2147483647 == 1)
1198511954
? 1 : -1];
@@ -12003,7 +11972,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1200311972
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1200411973
since some C++ compilers masquerading as C compilers
1200511974
incorrectly reject 9223372036854775807. */
12006-
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
11975+
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
1200711976
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1200811977
&& LARGE_OFF_T % 2147483647 == 1)
1200911978
? 1 : -1];
@@ -12048,7 +12017,7 @@ else
1204812017
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1204912018
since some C++ compilers masquerading as C compilers
1205012019
incorrectly reject 9223372036854775807. */
12051-
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
12020+
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
1205212021
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1205312022
&& LARGE_OFF_T % 2147483647 == 1)
1205412023
? 1 : -1];
@@ -12072,7 +12041,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1207212041
We can't simply define LARGE_OFF_T to be 9223372036854775807,
1207312042
since some C++ compilers masquerading as C compilers
1207412043
incorrectly reject 9223372036854775807. */
12075-
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
12044+
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
1207612045
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
1207712046
&& LARGE_OFF_T % 2147483647 == 1)
1207812047
? 1 : -1];

src/option.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3192,12 +3192,12 @@ static void fill_breakat_flags __ARGS((void));
31923192
static int opt_strings_flags __ARGS((char_u *val, char **values, unsigned *flagp, int list));
31933193
static int check_opt_strings __ARGS((char_u *val, char **values, int));
31943194
static int check_opt_wim __ARGS((void));
3195-
#ifdef FEAT_LINEBREAK
3196-
static int briopt_check __ARGS((win_T *wp));
3197-
#endif
31983195
#ifdef FEAT_FULLSCREEN
31993196
static int check_fuoptions __ARGS((char_u *, unsigned *, int *));
32003197
#endif
3198+
#ifdef FEAT_LINEBREAK
3199+
static int briopt_check __ARGS((win_T *wp));
3200+
#endif
32013201

32023202
/*
32033203
* Initialize the options, first part.

0 commit comments

Comments
 (0)