1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
diff -r b49f6c4c060a core/init.lua
--- a/core/init.lua Tue Jun 24 18:43:59 2008 -0400
+++ b/core/init.lua Wed Jun 25 14:44:26 2008 -0400
@@ -6,7 +6,6 @@ require 'iface'
require 'iface'
require 'events'
require 'file_io'
-require 'lua_dialog'
---
-- Checks if the buffer being indexed is the currently focused buffer.
@@ -31,10 +30,13 @@ end
-- used.
-- @return string CocoaDialog result.
function cocoa_dialog(kind, opts)
- local args = { kind }
+ local args = ''
for k, v in pairs(opts) do
- args[#args + 1] = '--'..k
- if type(v) == 'string' then args[#args + 1] = v end
+ args = args..' --'..k
+ if type(v) == 'string' then args = args..' "'..v..'"' end
end
- return lua_dialog.run(args)
+ local p = io.popen('CocoaDialog '..kind..args)
+ local out = p:read('*all')
+ p:close()
+ return out
end
diff -r b49f6c4c060a src/Makefile
--- a/src/Makefile Tue Jun 24 18:43:59 2008 -0400
+++ b/src/Makefile Wed Jun 25 14:44:26 2008 -0400
@@ -10,7 +10,7 @@ endif
endif
GTKFLAGS=$(shell pkg-config --cflags gtk+-2.0)
GTKLIBS=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
-EXPORTLUASYMS=-rdynamic -Wl,--retain-symbols-file -Wl,lua.sym
+EXPORTLUASYMS=
all: textadept
diff -r b49f6c4c060a src/textadept.c
--- a/src/textadept.c Tue Jun 24 18:43:59 2008 -0400
+++ b/src/textadept.c Wed Jun 25 14:44:26 2008 -0400
@@ -240,7 +240,7 @@ void new_scintilla_buffer(ScintillaObjec
// Setup default styling and properties.
SS(sci, SCI_STYLESETFONT, 32,
reinterpret_cast<long>("!Bitstream Vera Sans Mono"));
- SS(sci, SCI_STYLESETSIZE, 32, 8);
+ SS(sci, SCI_STYLESETSIZE, 32, 11);
SS(sci, SCI_STYLESETFORE, 32, 0xAA | (0xAA << 8) | (0xAA << 16));
SS(sci, SCI_STYLESETBACK, 32, 0x33 | (0x33 << 8) | (0x33 << 16));
SS(sci, SCI_SETSTYLEBITS, 8, 0);
@@ -585,7 +585,7 @@ void set_default_editor_properties(Scint
SS(sci, SCI_SETFOLDFLAGS, 16);
SS(sci, SCI_SETMODEVENTMASK, SC_MOD_CHANGEFOLD);
- SS(sci, SCI_SETMARGINWIDTHN, 0, 4 + 2 * // line number margin
+ SS(sci, SCI_SETMARGINWIDTHN, 0, 4 + 3 * // line number margin
SS(sci, SCI_TEXTWIDTH, STYLE_LINENUMBER, reinterpret_cast<long>("9")));
SS(sci, SCI_SETMARGINWIDTHN, 1, 0); // marker margin invisible
|
