aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/manual/11_Scripting.md4
-rw-r--r--doc/manual/6_AdeptEditing.md15
-rw-r--r--doc/manual/images/adeptsense_doc.pngbin0 -> 26369 bytes
-rw-r--r--doc/manual/images/adeptsense_lua.pngbin0 -> 17967 bytes
-rw-r--r--doc/manual/images/adeptsense_string.pngbin0 -> 18926 bytes
-rw-r--r--doc/manual/images/adeptsense_ta.pngbin0 -> 38941 bytes
-rw-r--r--doc/manual/images/adeptsense_tadoc.pngbin0 -> 65107 bytes
-rw-r--r--modules/lua/api2
-rw-r--r--modules/lua/tags2
9 files changed, 22 insertions, 1 deletions
diff --git a/doc/manual/11_Scripting.md b/doc/manual/11_Scripting.md
index aaaaa498..9e34187e 100644
--- a/doc/manual/11_Scripting.md
+++ b/doc/manual/11_Scripting.md
@@ -5,6 +5,10 @@ LuaDoc is available for many Textadept objects as well as Lua's standard
libraries. See the [lua module documentation](../modules/_m.lua.commands.html)
for more information.
+![Adeptsense ta](images/adeptsense_ta.png)
+    
+![Adeptsense tadoc](images/adeptsense_tadoc.png)
+
## LuaDoc and Examples
Textadept's API is heavily documented. The [LuaDoc](../index.html) is the
diff --git a/doc/manual/6_AdeptEditing.md b/doc/manual/6_AdeptEditing.md
index d2d7e1da..62f52a12 100644
--- a/doc/manual/6_AdeptEditing.md
+++ b/doc/manual/6_AdeptEditing.md
@@ -24,6 +24,21 @@ suggestion. Press `Return` to complete the selected word.
![Word Completion](images/wordcompletion.png)
+## Adeptsense
+
+Textadept has the capability to autocomplete symbols for programming languages
+and display API documentation. Lua is of course supported extremely well and
+C/C++ has basic support with the help of [ctags](http://ctags.sf.net).
+
+![Adeptsense Lua](images/adeptsense_lua.png)
+    
+![Adeptsense Lua String](images/adeptsense_string.png)
+
+![Adeptsense Doc](images/adeptsense_doc.png)
+
+For more information on adding adeptsense support for another language, see
+the [LuaDoc](../modules/_m.textadept.adeptsense.html).
+
## Find and Replace
`Ctrl+F` (`Apple+F` on Mac OSX) brings up the Find/Replace dialog. In addition
diff --git a/doc/manual/images/adeptsense_doc.png b/doc/manual/images/adeptsense_doc.png
new file mode 100644
index 00000000..36356591
--- /dev/null
+++ b/doc/manual/images/adeptsense_doc.png
Binary files differ
diff --git a/doc/manual/images/adeptsense_lua.png b/doc/manual/images/adeptsense_lua.png
new file mode 100644
index 00000000..75e581f2
--- /dev/null
+++ b/doc/manual/images/adeptsense_lua.png
Binary files differ
diff --git a/doc/manual/images/adeptsense_string.png b/doc/manual/images/adeptsense_string.png
new file mode 100644
index 00000000..ed5f4244
--- /dev/null
+++ b/doc/manual/images/adeptsense_string.png
Binary files differ
diff --git a/doc/manual/images/adeptsense_ta.png b/doc/manual/images/adeptsense_ta.png
new file mode 100644
index 00000000..e280fc72
--- /dev/null
+++ b/doc/manual/images/adeptsense_ta.png
Binary files differ
diff --git a/doc/manual/images/adeptsense_tadoc.png b/doc/manual/images/adeptsense_tadoc.png
new file mode 100644
index 00000000..8ccd325e
--- /dev/null
+++ b/doc/manual/images/adeptsense_tadoc.png
Binary files differ
diff --git a/modules/lua/api b/modules/lua/api
index f7f3b765..fc975bdd 100644
--- a/modules/lua/api
+++ b/modules/lua/api
@@ -390,7 +390,7 @@ goto_file_in_list gui.find.goto_file_in_list(next)\nGoes to the next or previous
replace gui.find.replace()\nMimicks a press of the 'Replace' button in the Find box.\n
replace_all gui.find.replace_all()\nMimicks a press of the 'Replace All' button in the Find box.\n
close_all io.close_all()\nCloses all open buffers. If any buffer is dirty, the user is prompted to\ncontinue. No buffers are saved automatically. They must be saved manually.\n@usage io.close_all()\n@return true if user did not cancel.\n
-open_file io.open_file(utf8_filenames)\nOpens a list of files.\n@param A '\\n' separated list of filenames to open. If none specified, the user\nis prompted to open files from a dialog. These paths must be encoded in UTF-8.\n@usage io.open_file(utf8_encoded_filename)\n
+open_file io.open_file(utf8_filenames)\nOpens a list of files.\n@param A '\\n' separated list of UTF-8-encoded filenames to open. If nil,\nthe user is prompted with a fileselect dialog.\n@usage io.open_file(utf8_encoded_filename)\n
save_all io.save_all()\nSaves all dirty buffers to their respective files.\n@usage io.save_all()\n
close io.close([file])\nEquivalent to `file:close()`. Without a `file`, closes the default output file.\n
flush io.flush()\nEquivalent to `file:flush` over the default output file.\n
diff --git a/modules/lua/tags b/modules/lua/tags
index 140fb0be..20b80e59 100644
--- a/modules/lua/tags
+++ b/modules/lua/tags
@@ -190,6 +190,8 @@ select_line _ 0;" f class:_m.textadept.editing
select_paragraph _ 0;" f class:_m.textadept.editing
select_scope _ 0;" f class:_m.textadept.editing
transpose_chars _ 0;" f class:_m.textadept.editing
+braces _ 0;" t class:_m.textadept.editing
+char_matches _ 0;" t class:_m.textadept.editing
comment_string _ 0;" t class:_m.textadept.editing
AUTOPAIR _ 0;" F class:_m.textadept.editing
HIGHLIGHT_BRACES _ 0;" F class:_m.textadept.editing