Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2017-01-17 10:55:41 +01:00
commit ed4ce98ac1

View File

@ -291,8 +291,8 @@ enabled:
<li><tt>load(string|reader [, chunkname [,mode [,env]]])</tt>.</li> <li><tt>load(string|reader [, chunkname [,mode [,env]]])</tt>.</li>
<li><tt>loadstring()</tt> is an alias for <tt>load()</tt>.</li> <li><tt>loadstring()</tt> is an alias for <tt>load()</tt>.</li>
<li><tt>loadfile(filename [,mode [,env]])</tt>.</li> <li><tt>loadfile(filename [,mode [,env]])</tt>.</li>
<li><tt>math.log(x [,base])</tt>. <li><tt>math.log(x [,base])</tt>.</li>
<li><tt>string.rep(s, n [,sep])</tt>. <li><tt>string.rep(s, n [,sep])</tt>.</li>
<li><tt>string.format()</tt>: <tt>%q</tt> reversible. <li><tt>string.format()</tt>: <tt>%q</tt> reversible.
<tt>%s</tt> checks <tt>__tostring</tt>. <tt>%s</tt> checks <tt>__tostring</tt>.
<tt>%a</tt> and <tt>"%A</tt> added.</li> <tt>%a</tt> and <tt>"%A</tt> added.</li>
@ -335,7 +335,7 @@ instead of <tt>true</tt>.</li>
exit status.</li> exit status.</li>
<li><tt>debug.setmetatable()</tt> returns object.</li> <li><tt>debug.setmetatable()</tt> returns object.</li>
<li><tt>debug.getuservalue()</tt> and <tt>debug.setuservalue()</tt>.</li> <li><tt>debug.getuservalue()</tt> and <tt>debug.setuservalue()</tt>.</li>
<li>Remove <tt>math.mod()</tt>, <tt>string.gfind()</tt>. <li>Remove <tt>math.mod()</tt>, <tt>string.gfind()</tt>.</li>
</ul> </ul>
<p> <p>
Note: this provides only partial compatibility with Lua 5.2 at the Note: this provides only partial compatibility with Lua 5.2 at the