diff options
author | 2010-10-28 17:52:35 -0400 | |
---|---|---|
committer | 2010-10-28 17:52:35 -0400 | |
commit | ef27dd85a00687a8b4a21b56a6ea9170b1c146b5 (patch) | |
tree | 6ccfc025cbcf2a1b244880984d4ee74e1bb4998a /modules | |
parent | 0ebbe321af357655d6833f9ca0792b3e212e57f8 (diff) | |
download | textadept-ef27dd85a00687a8b4a21b56a6ea9170b1c146b5.tar.gz textadept-ef27dd85a00687a8b4a21b56a6ea9170b1c146b5.zip |
Rename MAC variable in to OSX in Lua, __OSX__ in C.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/lua/commands.lua | 2 | ||||
-rw-r--r-- | modules/textadept/keys.lua | 6 | ||||
-rw-r--r-- | modules/textadept/menu.lua | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/lua/commands.lua b/modules/lua/commands.lua index fef5713f..c6a65bcb 100644 --- a/modules/lua/commands.lua +++ b/modules/lua/commands.lua @@ -248,7 +248,7 @@ if type(keys) == 'table' then g = { goto_required }, }, ['s\n'] = { try_to_autocomplete_end }, - [not MAC and 'c\n' or 'esc'] = { function() -- complete API + [not OSX and 'c\n' or 'esc'] = { function() -- complete API local part = prev_word('[%w_]', buffer.current_pos) local pos = buffer.current_pos - #part - 1 if pos > 0 then diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua index a8c09656..baea06a8 100644 --- a/modules/textadept/keys.lua +++ b/modules/textadept/keys.lua @@ -134,7 +134,7 @@ local gui = gui -- Control, Shift, Alt, and 'a' = 'caA' -- Control, Shift, Alt, and '\t' = 'csa\t' -if not MAC then +if not OSX then -- Windows and Linux key commands. --[[ @@ -496,7 +496,7 @@ local pcall = _G.pcall local next = _G.next local type = _G.type local unpack = _G.unpack -local MAC = _G.MAC +local OSX = _G.OSX --- -- Lookup table for key values higher than 255. @@ -594,7 +594,7 @@ local function keypress(code, shift, control, alt) if code < 256 then key = string_char(code) shift = false -- for printable characters, key is upper case - if MAC and not shift and not control and not alt then + if OSX and not shift and not control and not alt then local ch = string_char(code) -- work around native GTK-OSX's handling of Alt key if ch:find('[%p%d]') and #keychain == 0 then diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua index daf3f6df..40e2c516 100644 --- a/modules/textadept/menu.lua +++ b/modules/textadept/menu.lua @@ -329,7 +329,7 @@ local function open_webpage(url) local p = io.popen(cmd) if not p then error(L('Error loading webpage:')..url) end else - cmd = string.format(MAC and 'open "file://%s"' or 'xdg-open "%s" &', url) + cmd = string.format(OSX and 'open "file://%s"' or 'xdg-open "%s" &', url) if os.execute(cmd) ~= 0 then error(L('Error loading webpage:')..url) end end end |