mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Merge branches 'bugfixes' and 'fixes' into feature

Browse source
This commit is contained in:
arch1t3cht 2023-10-13 00:36:09 +02:00
parent 61ec2bc3e7 4e6af75db4 a631bf192c
commit 82b7e96cea
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
automation/include/cleantags.lua
View file

@ -23,10 +23,10 @@ OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
]] ]]
cleantags_version = "1.301" cleantags_version = "1.302"
cleantags_modified = "13 November 2009" cleantags_modified = "12 October 2023"
ktag = "\\[kK][fo]?%d+" ktag = "\\[kK][fo]?[%d.]+"
--[[ The main function that performs the cleaning up --[[ The main function that performs the cleaning up
Takes: text Takes: text

6
src/auto4_lua_dialog.cpp
View file

@ -326,6 +326,12 @@ namespace Automation4 {
{ {
lua_getfield(L, -1, "items"); lua_getfield(L, -1, "items");
read_string_array(L, items); read_string_array(L, items);
#ifdef __WXMAC__
if (std::find(items.begin(), items.end(), value) == items.end()) {
items.insert(items.begin(), value);
}
#endif
} }
bool CanSerialiseValue() const override { return true; } bool CanSerialiseValue() const override { return true; }

1
subprojects/packagefiles/luajit/src/host/meson.build
View file

@ -21,6 +21,7 @@ else
hpre = '#include "@0@/../lj_arch.h"'.format(meson.current_source_dir()) hpre = '#include "@0@/../lj_arch.h"'.format(meson.current_source_dir())
checkdefs = [ checkdefs = [
['LJ_LE', '1', ['-D', 'ENDIAN_LE']],
['LJ_ARCH_BITS', '64', ['-D', 'P64']], ['LJ_ARCH_BITS', '64', ['-D', 'P64']],
['LJ_HASJIT', '1', ['-D', 'JIT']], ['LJ_HASJIT', '1', ['-D', 'JIT']],
['LJ_HASFFI', '1', ['-D', 'FFI']], ['LJ_HASFFI', '1', ['-D', 'FFI']],