Skip to content

Commit 8cbd16e

Browse files
ychinychin
committed
Merge remote-tracking branch 'vim/master'
2 parents 2ab2d08 + a1fa8b3 commit 8cbd16e

24 files changed

Lines changed: 288 additions & 133 deletions

‎runtime/doc/builtin.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7152,7 +7152,8 @@ reltimestr({time}) *reltimestr()*
71527152
call MyFunction()
71537153
echo reltimestr(reltime(start))
71547154
< Note that overhead for the commands will be added to the time.
7155-
The accuracy depends on the system.
7155+
The accuracy depends on the system. Use reltimefloat() for the
7156+
greatest accuracy which is nanoseconds on some systems.
71567157
Leading spaces are used to make the string align nicely. You
71577158
can use split() to remove it. >
71587159
echo split(reltimestr(reltime(start)))[0]
@@ -10777,6 +10778,7 @@ persistent_undo Compiled with support for persistent undo history.
1077710778
postscript Compiled with PostScript file printing.
1077810779
printer Compiled with |:hardcopy| support.
1077910780
profile Compiled with |:profile| support.
10781+
prof_nsec Profile results are in nano seconds.
1078010782
python Python 2.x interface available. |has-python|
1078110783
python_compiled Compiled with Python 2.x interface. |has-python|
1078210784
python_dynamic Python 2.x interface is dynamically loaded. |has-python|

‎runtime/doc/repeat.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,9 +1148,10 @@ long you take to respond to the input() prompt is irrelevant.
11481148
Profiling should give a good indication of where time is spent, but keep in
11491149
mind there are various things that may clobber the results:
11501150

1151-
- The accuracy of the time measured depends on the gettimeofday() system
1152-
function. It may only be as accurate as 1/100 second, even though the times
1153-
are displayed in micro seconds.
1151+
- The accuracy of the time measured depends on the gettimeofday(), or
1152+
clock_gettime if available, system function. The accuracy ranges from 1/100
1153+
second to nano seconds. With clock_gettime the times are displayed in nano
1154+
seconds, otherwise micro seconds. You can use `has("prof_nsec")`.
11541155

11551156
- Real elapsed time is measured, if other processes are busy they may cause
11561157
delays at unpredictable moments. You may want to run the profiling several

‎runtime/filetype.vim‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,9 @@ au BufNewFile,BufRead *.cook setf cook
439439
" needs to be inspected.
440440
au BufNewFile,BufRead *.cql setf cqlang
441441

442+
" Crystal
443+
au BufNewFile,BufRead *.cr setf crystal
444+
442445
" CSV Files
443446
au BufNewFile,BufRead *.csv setf csv
444447

@@ -650,6 +653,9 @@ au BufNewFile,BufRead filter-rules setf elmfilt
650653
" Elsa - https://github.com/ucsd-progsys/elsa
651654
au BufNewFile,BufRead *.lc setf elsa
652655

656+
" EdgeDB Schema Definition Language
657+
au BufNewFile,BufRead *.esdl setf esdl
658+
653659
" ESMTP rc file
654660
au BufNewFile,BufRead *esmtprc setf esmtprc
655661

@@ -1539,6 +1545,9 @@ au BufNewFile,BufRead *.plp setf plp
15391545
" PO and PO template (GNU gettext)
15401546
au BufNewFile,BufRead *.po,*.pot setf po
15411547

1548+
" Pony
1549+
au BufNewFile,BufRead *.pony setf pony
1550+
15421551
" Postfix main config
15431552
au BufNewFile,BufRead main.cf,main.cf.proto setf pfmain
15441553

@@ -1649,9 +1658,15 @@ au BufNewFile,BufRead *.ptl,*.pyi,SConstruct setf python
16491658
" QL
16501659
au BufRead,BufNewFile *.ql,*.qll setf ql
16511660

1661+
" QMLdir
1662+
au BufRead,BufNewFile qmldir setf qmldir
1663+
16521664
" Quarto
16531665
au BufRead,BufNewFile *.qmd setf quarto
16541666

1667+
" Racket (formerly detected as "scheme")
1668+
au BufNewFile,BufRead *.rkt,*.rktd,*.rktl setf racket
1669+
16551670
" Radiance
16561671
au BufNewFile,BufRead *.rad,*.mat setf radiance
16571672

@@ -1732,6 +1747,9 @@ au BufNewFile,BufRead *.rnc setf rnc
17321747
" Relax NG XML
17331748
au BufNewFile,BufRead *.rng setf rng
17341749

1750+
" ILE RPG
1751+
au BufNewFile,BufRead *.rpgle,*.rpgleinc setf rpgle
1752+
17351753
" RPL/2
17361754
au BufNewFile,BufRead *.rpl setf rpl
17371755

@@ -1916,8 +1934,8 @@ au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks setf zsh
19161934
au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
19171935
au BufNewFile,BufRead *.zsh setf zsh
19181936

1919-
" Scheme
1920-
au BufNewFile,BufRead *.scm,*.ss,*.sld,*.rkt,*.rktd,*.rktl setf scheme
1937+
" Scheme ("racket" patterns are now separate, see above)
1938+
au BufNewFile,BufRead *.scm,*.ss,*.sld setf scheme
19211939

19221940
" Screen RC
19231941
au BufNewFile,BufRead .screenrc,screenrc setf screen
@@ -2102,6 +2120,9 @@ au BufNewFile,BufRead *.svg setf svg
21022120
" Surface
21032121
au BufRead,BufNewFile *.sface setf surface
21042122

2123+
" LLVM TableGen
2124+
au BufNewFile,BufRead *.td setf tablegen
2125+
21052126
" Tads (or Nroff or Perl test file)
21062127
au BufNewFile,BufRead *.t
21072128
\ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif

‎runtime/lang/Makefile‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,25 @@ all: \
2525
menu_hu_hu.iso_8859-2.vim \
2626
menu_sk_sk.iso_8859-2.vim \
2727

28+
SED = LANG=C sed
2829

2930
# Convert menu_zh_cn.utf-8.vim to create menu_chinese_gb.936.vim.
3031
menu_chinese_gb.936.vim: menu_zh_cn.utf-8.vim
3132
rm -f menu_chinese_gb.936.vim
3233
iconv -f utf-8 -t cp936 menu_zh_cn.utf-8.vim | \
33-
sed -e 's/scriptencoding utf-8/scriptencoding cp936/' -e 's/" Original translations/" Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT/' > menu_chinese_gb.936.vim
34+
$(SED) -e 's/scriptencoding utf-8/scriptencoding cp936/' -e 's/" Original translations/" Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT/' > menu_chinese_gb.936.vim
3435

3536
# Convert menu_zh_tw.utf-8.vim to create menu_chinese_taiwan.950.vim.
3637
menu_chinese_taiwan.950.vim: menu_zh_tw.utf-8.vim
3738
rm -f menu_chinese_taiwan.950.vim
3839
iconv -f utf-8 -t cp950 menu_zh_tw.utf-8.vim | \
39-
sed -e 's/scriptencoding utf-8/scriptencoding cp950/' -e 's/" Original translations/" Generated from menu_zh_tw.utf-8.vim, DO NOT EDIT/' > menu_chinese_taiwan.950.vim
40+
$(SED) -e 's/scriptencoding utf-8/scriptencoding cp950/' -e 's/" Original translations/" Generated from menu_zh_tw.utf-8.vim, DO NOT EDIT/' > menu_chinese_taiwan.950.vim
4041

4142
# Convert menu_cs_cz.utf-8.vim to create menu_cs_cz.iso_8859-2.vim.
4243
menu_cs_cz.iso_8859-2.vim: menu_cs_cz.utf-8.vim
4344
rm -f menu_cs_cz.iso_8859-2.vim
4445
iconv -f utf-8 -t iso8859-2 menu_cs_cz.utf-8.vim | \
45-
sed -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' \
46+
$(SED) -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' \
4647
-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \
4748
-e 's/\(" Menu Translations:.*\)(.*)/\1(ISO8859-2)/' \
4849
> menu_cs_cz.iso_8859-2.vim
@@ -51,15 +52,15 @@ menu_cs_cz.iso_8859-2.vim: menu_cs_cz.utf-8.vim
5152
menu_czech_czech_republic.1250.vim: menu_cs_cz.utf-8.vim
5253
rm -f menu_czech_czech_republic.1250.vim
5354
iconv -f utf-8 -t cp1250 menu_cs_cz.utf-8.vim | \
54-
sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' \
55+
$(SED) -e 's/scriptencoding utf-8/scriptencoding cp1250/' \
5556
-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \
5657
-e 's/\(" Menu Translations:.*\)(.*)/\1(CP1250)/' \
5758
> menu_czech_czech_republic.1250.vim
5859

5960
# Convert menu_cs_cz.utf-8.vim to create menu_czech_czech_republic.ascii.vim.
6061
menu_czech_czech_republic.ascii.vim: menu_cs_cz.utf-8.vim
6162
rm -f menu_czech_czech_republic.ascii.vim
62-
sed -e 's/Á/A/g' -e 's/á/a/g' -e 's/Č/C/g' -e 's/č/c/g' -e 's/Ď/D/g' \
63+
$(SED) -e 's/Á/A/g' -e 's/á/a/g' -e 's/Č/C/g' -e 's/č/c/g' -e 's/Ď/D/g' \
6364
-e 's/ď/d/g' -e 's/É/E/g' -e 's/é/e/g' -e 's/Ě/E/g' -e 's/ě/e/g' \
6465
-e 's/Í/I/g' -e 's/í/i/g' -e 's/Ň/N/g' -e 's/ň/n/g' -e 's/Ó/O/g' \
6566
-e 's/ó/o/g' -e 's/Ř/R/g' -e 's/ř/r/g' -e 's/Š/S/g' -e 's/š/s/g' \
@@ -74,7 +75,7 @@ menu_czech_czech_republic.ascii.vim: menu_cs_cz.utf-8.vim
7475
menu_ja_jp.euc-jp.vim: menu_ja_jp.utf-8.vim
7576
rm -f menu_ja_jp.euc-jp.vim
7677
iconv -f utf-8 -t euc-jp menu_ja_jp.utf-8.vim | \
77-
sed -e 's/scriptencoding utf-8/scriptencoding euc-jp/' \
78+
$(SED) -e 's/scriptencoding utf-8/scriptencoding euc-jp/' \
7879
-e 's/" Original translations/" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT/' \
7980
-e 's/\(" Menu Translations:.*\)(.*)/\1(EUC-JP)/' \
8081
> menu_ja_jp.euc-jp.vim
@@ -83,7 +84,7 @@ menu_ja_jp.euc-jp.vim: menu_ja_jp.utf-8.vim
8384
menu_japanese_japan.932.vim: menu_ja_jp.utf-8.vim
8485
rm -f menu_japanese_japan.932.vim
8586
iconv -f utf-8 -t cp932 menu_ja_jp.utf-8.vim | \
86-
sed -e 's/scriptencoding utf-8/scriptencoding cp932/' \
87+
$(SED) -e 's/scriptencoding utf-8/scriptencoding cp932/' \
8788
-e 's/" Original translations/" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT/' \
8889
-e 's/\(" Menu Translations:.*\)(.*)/\1(CP932)/' \
8990
> menu_japanese_japan.932.vim
@@ -92,67 +93,67 @@ menu_japanese_japan.932.vim: menu_ja_jp.utf-8.vim
9293
menu_ko_kr.euckr.vim: menu_ko_kr.utf-8.vim
9394
rm -f menu_ko_kr.euckr.vim
9495
iconv -f utf-8 -t euc-kr menu_ko_kr.utf-8.vim | \
95-
sed -e 's/scriptencoding utf-8/scriptencoding euc-kr/' -e 's/" Original translations/" Generated from menu_ko_kr.utf-8.vim, DO NOT EDIT/' > menu_ko_kr.euckr.vim
96+
$(SED) -e 's/scriptencoding utf-8/scriptencoding euc-kr/' -e 's/" Original translations/" Generated from menu_ko_kr.utf-8.vim, DO NOT EDIT/' > menu_ko_kr.euckr.vim
9697

9798
# Convert menu_pl_pl.utf-8.vim to create menu_pl_pl.iso_8859-2.vim.
9899
menu_pl_pl.iso_8859-2.vim: menu_pl_pl.utf-8.vim
99100
rm -f menu_pl_pl.iso_8859-2.vim
100101
iconv -f utf-8 -t iso8859-2 menu_pl_pl.utf-8.vim | \
101-
sed -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_pl_pl.iso_8859-2.vim
102+
$(SED) -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_pl_pl.iso_8859-2.vim
102103

103104
# Convert menu_pl_pl.utf-8.vim to create menu_polish_poland.1250.vim.
104105
menu_polish_poland.1250.vim: menu_pl_pl.utf-8.vim
105106
rm -f menu_polish_poland.1250.vim
106107
iconv -f utf-8 -t cp1250 menu_pl_pl.utf-8.vim | \
107-
sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_polish_poland.1250.vim
108+
$(SED) -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_polish_poland.1250.vim
108109

109110
# Convert menu_ru_ru.utf-8.vim to create menu_ru_ru.koi8-r.vim.
110111
menu_ru_ru.koi8-r.vim: menu_ru_ru.utf-8.vim
111112
rm -f menu_ru_ru.koi8-r.vim
112113
iconv -f utf-8 -t koi8-r menu_ru_ru.utf-8.vim | \
113-
sed -e 's/scriptencoding utf-8/scriptencoding koi8-r/' -e 's/" Original translations/" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT/' > menu_ru_ru.koi8-r.vim
114+
$(SED) -e 's/scriptencoding utf-8/scriptencoding koi8-r/' -e 's/" Original translations/" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT/' > menu_ru_ru.koi8-r.vim
114115

115116
# Convert menu_sl_si.utf-8.vim to create menu_sl_si.cp1250.vim.
116117
menu_sl_si.cp1250.vim: menu_sl_si.utf-8.vim
117118
rm -f menu_sl_si.cp1250.vim
118119
iconv -f utf-8 -t cp1250 menu_sl_si.utf-8.vim | \
119-
sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' \
120+
$(SED) -e 's/scriptencoding utf-8/scriptencoding cp1250/' \
120121
-e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_sl_si.cp1250.vim
121122

122123
# Convert menu_uk_ua.utf-8.vim to create menu_sl_si.latin2.vim.
123124
menu_sl_si.latin2.vim: menu_sl_si.utf-8.vim
124125
rm -f menu_sl_si.latin2.vim
125126
iconv -f utf-8 -t latin2 menu_sl_si.utf-8.vim | \
126-
sed -e 's/scriptencoding utf-8/scriptencoding latin2/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_sl_si.latin2.vim
127+
$(SED) -e 's/scriptencoding utf-8/scriptencoding latin2/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_sl_si.latin2.vim
127128

128129
# Convert menu_uk_ua.utf-8.vim to create menu_slovak_slovak_republic.1250.vim.
129130
menu_slovak_slovak_republic.1250.vim: menu_sl_si.utf-8.vim
130131
rm -f menu_slovak_slovak_republic.1250.vim
131132
iconv -f utf-8 -t cp1250 menu_sl_si.utf-8.vim | \
132-
sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_slovak_slovak_republic.1250.vim
133+
$(SED) -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_slovak_slovak_republic.1250.vim
133134

134135
# Convert menu_tr_tr.utf-8.vim to create menu_tr_tr.cp1254.vim.
135136
menu_tr_tr.cp1254.vim: menu_tr_tr.utf-8.vim
136137
rm -f menu_tr_tr.cp1254.vim
137138
iconv -f utf-8 -t cp1254 menu_tr_tr.utf-8.vim | \
138-
sed -e 's/scriptencoding utf-8/scriptencoding cp1254/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.cp1254.vim
139+
$(SED) -e 's/scriptencoding utf-8/scriptencoding cp1254/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.cp1254.vim
139140

140141
# Convert menu_tr_tr.utf-8.vim to create menu_tr_tr.iso_8859-9.vim.
141142
menu_tr_tr.iso_8859-9.vim: menu_tr_tr.utf-8.vim
142143
rm -f menu_tr_tr.iso_8859-9.vim
143144
iconv -f utf-8 -t iso8859-9 menu_tr_tr.utf-8.vim | \
144-
sed -e 's/scriptencoding utf-8/scriptencoding iso8859-9/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.iso_8859-9.vim
145+
$(SED) -e 's/scriptencoding utf-8/scriptencoding iso8859-9/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.iso_8859-9.vim
145146

146147
# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.iso_8859-5.vim.
147148
menu_sr_rs.iso_8859-5.vim: menu_sr_rs.utf-8.vim
148149
rm -f menu_sr_rs.iso_8859-5.vim
149150
iconv -f utf-8 -t iso8859-5 menu_sr_rs.utf-8.vim | \
150-
sed -e 's/scriptencoding utf-8/scriptencoding iso8859-5/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' > menu_sr_rs.iso_8859-5.vim
151+
$(SED) -e 's/scriptencoding utf-8/scriptencoding iso8859-5/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' > menu_sr_rs.iso_8859-5.vim
151152

152153
# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.iso_8859-2.vim.
153154
menu_sr_rs.iso_8859-2.vim: menu_sr_rs.utf-8.vim
154155
rm -f menu_sr_rs.iso_8859-2.vim
155-
sed -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
156+
$(SED) -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
156157
-e 's/ђ/đ/g' -e 's/е/e/g' -e 's/ж/ž/g' -e 's/з/z/g' -e 's/и/i/g' \
157158
-e 's/ј/j/g' -e 's/к/k/g' -e 's/л/l/g' -e 's/љ/lj/g' -e 's/м/m/g' \
158159
-e 's/н/n/g' -e 's/њ/nj/g' -e 's/о/o/g' -e 's/п/p/g' -e 's/р/r/g' \
@@ -171,7 +172,7 @@ menu_sr_rs.iso_8859-2.vim: menu_sr_rs.utf-8.vim
171172
# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.ascii.vim.
172173
menu_sr_rs.ascii.vim: menu_sr_rs.utf-8.vim
173174
rm -f menu_sr_rs.ascii.vim
174-
sed -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
175+
$(SED) -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
175176
-e 's/ђ/dj/g' -e 's/е/e/g' -e 's/ж/z/g' -e 's/з/z/g' -e 's/и/i/g' \
176177
-e 's/ј/j/g' -e 's/к/k/g' -e 's/л/l/g' -e 's/љ/lj/g' -e 's/м/m/g' \
177178
-e 's/н/n/g' -e 's/њ/nj/g' -e 's/о/o/g' -e 's/п/p/g' -e 's/р/r/g' \
@@ -190,22 +191,22 @@ menu_sr_rs.ascii.vim: menu_sr_rs.utf-8.vim
190191
menu_uk_ua.cp1251.vim: menu_uk_ua.utf-8.vim
191192
rm -f menu_uk_ua.cp1251.vim
192193
iconv -f utf-8 -t cp1251 menu_uk_ua.utf-8.vim | \
193-
sed -e 's/scriptencoding utf-8/scriptencoding cp1251/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.cp1251.vim
194+
$(SED) -e 's/scriptencoding utf-8/scriptencoding cp1251/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.cp1251.vim
194195

195196
# Convert menu_uk_ua.utf-8.vim to create menu_uk_ua.koi8-u.vim.
196197
menu_uk_ua.koi8-u.vim: menu_uk_ua.utf-8.vim
197198
rm -f menu_uk_ua.koi8-u.vim
198199
iconv -f utf-8 -t koi8-u menu_uk_ua.utf-8.vim | \
199-
sed -e 's/scriptencoding utf-8/scriptencoding koi8-u/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.koi8-u.vim
200+
$(SED) -e 's/scriptencoding utf-8/scriptencoding koi8-u/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.koi8-u.vim
200201

201202
# Convert menu_hu_hu.utf-8.vim to create menu_hu_hu.iso_8859-2.vim.
202203
menu_hu_hu.iso_8859-2.vim: menu_hu_hu.utf-8.vim
203204
rm -f menu_hu_hu.iso_8859-2.vim
204205
iconv -f utf-8 -t iso8859-2 menu_hu_hu.utf-8.vim | \
205-
sed -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_hu_hu.utf-8.vim, DO NOT EDIT/' > menu_hu_hu.iso_8859-2.vim
206+
$(SED) -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_hu_hu.utf-8.vim, DO NOT EDIT/' > menu_hu_hu.iso_8859-2.vim
206207

207208
# Convert menu_slovak_slovak_republic.1250.vim to create menu_sk_sk.iso_8859-2.vim.
208209
menu_sk_sk.iso_8859-2.vim: menu_slovak_slovak_republic.1250.vim
209210
rm -f menu_sk_sk.iso_8859-2.vim
210211
iconv -f cp1250 -t iso8859-2 menu_slovak_slovak_republic.1250.vim | \
211-
sed -e 's/scriptencoding cp1250/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_slovak_slovak_republic.1250.vim, DO NOT EDIT/' > menu_sk_sk.iso_8859-2.vim
212+
$(SED) -e 's/scriptencoding cp1250/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_slovak_slovak_republic.1250.vim, DO NOT EDIT/' > menu_sk_sk.iso_8859-2.vim

‎src/blob.c‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,10 @@ blob_filter_map(
592592
blob_T *blob_arg,
593593
filtermap_T filtermap,
594594
typval_T *expr,
595+
char_u *arg_errmsg,
595596
typval_T *rettv)
596597
{
597-
blob_T *b;
598+
blob_T *b = blob_arg;
598599
int i;
599600
typval_T tv;
600601
varnumber_T val;
@@ -609,7 +610,8 @@ blob_filter_map(
609610
rettv->v_type = VAR_BLOB;
610611
rettv->vval.v_blob = NULL;
611612
}
612-
if ((b = blob_arg) == NULL)
613+
if (b == NULL || (filtermap == FILTERMAP_FILTER
614+
&& value_check_lock(b->bv_lock, arg_errmsg, TRUE)))
613615
return;
614616

615617
b_ret = b;
@@ -623,6 +625,10 @@ blob_filter_map(
623625
// set_vim_var_nr() doesn't set the type
624626
set_vim_var_type(VV_KEY, VAR_NUMBER);
625627

628+
int prev_lock = b->bv_lock;
629+
if (b->bv_lock == 0)
630+
b->bv_lock = VAR_LOCKED;
631+
626632
// Create one funccal_T for all eval_expr_typval() calls.
627633
fc = eval_expr_get_funccal(expr, &newtv);
628634

@@ -658,6 +664,7 @@ blob_filter_map(
658664
++idx;
659665
}
660666

667+
b->bv_lock = prev_lock;
661668
if (fc != NULL)
662669
remove_funccal();
663670
}

‎src/dict.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ dict_extend_func(
13051305
action = (char_u *)"force";
13061306

13071307
if (type != NULL && check_typval_arg_type(type, &argvars[1],
1308-
func_name, 2) == FAIL)
1308+
func_name, 2) == FAIL)
13091309
return;
13101310
dict_extend(d1, d2, action, func_name);
13111311

@@ -1333,7 +1333,6 @@ dict_filter_map(
13331333
typval_T *expr,
13341334
typval_T *rettv)
13351335
{
1336-
int prev_lock;
13371336
dict_T *d_ret = NULL;
13381337
hashtab_T *ht;
13391338
hashitem_T *hi;
@@ -1353,8 +1352,6 @@ dict_filter_map(
13531352
&& value_check_lock(d->dv_lock, arg_errmsg, TRUE)))
13541353
return;
13551354

1356-
prev_lock = d->dv_lock;
1357-
13581355
if (filtermap == FILTERMAP_MAPNEW)
13591356
{
13601357
if (rettv_dict_alloc(rettv) == FAIL)
@@ -1365,7 +1362,8 @@ dict_filter_map(
13651362
// Create one funccal_T for all eval_expr_typval() calls.
13661363
fc = eval_expr_get_funccal(expr, &newtv);
13671364

1368-
if (filtermap != FILTERMAP_FILTER && d->dv_lock == 0)
1365+
int prev_lock = d->dv_lock;
1366+
if (d->dv_lock == 0)
13691367
d->dv_lock = VAR_LOCKED;
13701368
ht = &d->dv_hashtab;
13711369
hash_lock(ht);

‎src/evalfunc.c‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6160,6 +6160,13 @@ f_has(typval_T *argvars, typval_T *rettv)
61606160
1
61616161
#else
61626162
0
6163+
#endif
6164+
},
6165+
{"prof_nsec",
6166+
#ifdef HAVE_TIMER_CREATE
6167+
1
6168+
#else
6169+
0
61636170
#endif
61646171
},
61656172
{"reltime",
@@ -8264,7 +8271,7 @@ init_srand(UINT32_T *x)
82648271
# if defined(MSWIN)
82658272
*x = (UINT32_T)res.LowPart;
82668273
# else
8267-
*x = (UINT32_T)res.tv_usec;
8274+
*x = (UINT32_T)res.tv_fsec;
82688275
# endif
82698276
#else
82708277
*x = vim_time();

0 commit comments

Comments
 (0)