Skip to content

Commit 0c935dd

Browse files
splhacksplhack
committed
Merge remote-tracking branch 'vim/master'
2 parents c9b303e + ba59ddb commit 0c935dd

File tree

6 files changed

+37
-30
lines changed

6 files changed

+37
-30
lines changed

‎runtime/doc/eval.txt‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2016 Jan 24
1+
*eval.txt* For Vim version 7.4. Last change: 2016 Jan 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2842,6 +2842,7 @@ empty({expr}) *empty()*
28422842
Return the Number 1 if {expr} is empty, zero otherwise.
28432843
A |List| or |Dictionary| is empty when it does not have any
28442844
items. A Number is empty when its value is zero.
2845+
|v:false|, |v:none| and |v:null| are empty, |v:true| is not.
28452846
For a long |List| this is much faster than comparing the
28462847
length with zero.
28472848

@@ -4252,16 +4253,21 @@ jsondecode({string}) *jsondecode()*
42524253
JSON and Vim values.
42534254
The decoding is permissive:
42544255
- A trailing comma in an array and object is ignored.
4255-
- An empty item in an array results in v:none.
4256-
- When an object name is not a string it is converted to a
4257-
string. E.g. the number 123 is used as the string "123".
4256+
- An empty item in an array, two commas with nothing or white
4257+
space in between, results in v:none.
4258+
- When an object member name is not a string it is converted
4259+
to a string. E.g. the number 123 is used as the string
4260+
"123".
42584261
- More floating point numbers are recognized, e.g. "1." for
42594262
"1.0".
4263+
The result must be a valid Vim type:
4264+
- An empty object member name is not allowed.
4265+
- Duplicate object member names are not allowed.
42604266

42614267
jsonencode({expr}) *jsonencode()*
42624268
Encode {expr} as JSON and return this as a string.
42634269
The encoding is specified in:
4264-
http://www.ietf.org/rfc/rfc4627.txt
4270+
https://tools.ietf.org/html/rfc7159.html
42654271
Vim values are converted as follows:
42664272
Number decimal number
42674273
Float floating point number
@@ -5889,18 +5895,8 @@ shellescape({string} [, {special}]) *shellescape()*
58895895
shiftwidth() *shiftwidth()*
58905896
Returns the effective value of 'shiftwidth'. This is the
58915897
'shiftwidth' value unless it is zero, in which case it is the
5892-
'tabstop' value. To be backwards compatible in indent
5893-
plugins, use this: >
5894-
if exists('*shiftwidth')
5895-
func s:sw()
5896-
return shiftwidth()
5897-
endfunc
5898-
else
5899-
func s:sw()
5900-
return &sw
5901-
endfunc
5902-
endif
5903-
< And then use s:sw() instead of &sw.
5898+
'tabstop' value. This function was introduced with patch
5899+
7.3.694 in 2012, everybody should have it by now.
59045900

59055901

59065902
simplify({filename}) *simplify()*

‎src/auto/configure‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6052,7 +6052,9 @@ eof
60526052

60536053
fi
60546054

6055-
if ${vi_cv_dll_name_python+:} false; then :
6055+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's dll name" >&5
6056+
$as_echo_n "checking Python's dll name... " >&6; }
6057+
if ${vi_cv_dll_name_python+:} false; then :
60566058
$as_echo_n "(cached) " >&6
60576059
else
60586060

@@ -6063,7 +6065,8 @@ else
60636065
fi
60646066

60656067
fi
6066-
6068+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python" >&5
6069+
$as_echo "$vi_cv_dll_name_python" >&6; }
60676070

60686071
PYTHON_LIBS="${vi_cv_path_python_plibs}"
60696072
if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
@@ -6388,7 +6391,9 @@ eof
63886391

63896392
fi
63906393

6391-
if ${vi_cv_dll_name_python3+:} false; then :
6394+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Python3's dll name" >&5
6395+
$as_echo_n "checking Python3's dll name... " >&6; }
6396+
if ${vi_cv_dll_name_python3+:} false; then :
63926397
$as_echo_n "(cached) " >&6
63936398
else
63946399

@@ -6399,7 +6404,8 @@ else
63996404
fi
64006405

64016406
fi
6402-
6407+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python3" >&5
6408+
$as_echo "$vi_cv_dll_name_python3" >&6; }
64036409

64046410
PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
64056411
if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
@@ -6551,7 +6557,7 @@ else
65516557
int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
65526558
{
65536559
int needed = 0;
6554-
void* pylib = dlopen(python_instsoname, RTLD_LAZY);
6560+
void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
65556561
if (pylib != 0)
65566562
{
65576563
void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome");
@@ -6617,7 +6623,7 @@ else
66176623
int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
66186624
{
66196625
int needed = 0;
6620-
void* pylib = dlopen(python_instsoname, RTLD_LAZY);
6626+
void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
66216627
if (pylib != 0)
66226628
{
66236629
void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome");

‎src/configure.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ eof
12491249
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
12501250
fi
12511251
])
1252-
AC_CACHE_VAL(vi_cv_dll_name_python,
1252+
AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
12531253
[
12541254
if test "X$python_DLLLIBRARY" != "X"; then
12551255
vi_cv_dll_name_python="$python_DLLLIBRARY"
@@ -1468,7 +1468,7 @@ eof
14681468
vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
14691469
vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
14701470
])
1471-
AC_CACHE_VAL(vi_cv_dll_name_python3,
1471+
AC_CACHE_CHECK(Python3's dll name,vi_cv_dll_name_python3,
14721472
[
14731473
if test "X$python3_DLLLIBRARY" != "X"; then
14741474
vi_cv_dll_name_python3="$python3_DLLLIBRARY"
@@ -1586,7 +1586,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
15861586
int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
15871587
{
15881588
int needed = 0;
1589-
void* pylib = dlopen(python_instsoname, RTLD_LAZY);
1589+
void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
15901590
if (pylib != 0)
15911591
{
15921592
void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome");
@@ -1632,7 +1632,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
16321632
int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
16331633
{
16341634
int needed = 0;
1635-
void* pylib = dlopen(python_instsoname, RTLD_LAZY);
1635+
void* pylib = dlopen(python_instsoname, RTLD_LAZY|RTLD_LOCAL);
16361636
if (pylib != 0)
16371637
{
16381638
void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome");

‎src/json.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/*
1111
* json.c: Encoding and decoding JSON.
1212
*
13-
* Follows this standard: http://www.ietf.org/rfc/rfc4627.txt
13+
* Follows this standard: https://tools.ietf.org/html/rfc7159.html
1414
*/
1515

1616
#include "vim.h"

‎src/os_win32.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,12 +500,11 @@ dyn_libintl_init()
500500
if (hLibintlDLL)
501501
return 1;
502502
/* Load gettext library (libintl.dll) */
503+
hLibintlDLL = vimLoadLib(GETTEXT_DLL);
503504
#ifdef GETTEXT_DLL_ALT
504505
if (!hLibintlDLL)
505506
hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT);
506507
#endif
507-
if (!hLibintlDLL)
508-
hLibintlDLL = vimLoadLib(GETTEXT_DLL);
509508
if (!hLibintlDLL)
510509
{
511510
if (p_verbose > 0)

‎src/version.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,12 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1190,
766+
/**/
767+
1189,
768+
/**/
769+
1188,
764770
/**/
765771
1187,
766772
/**/

0 commit comments

Comments
 (0)