aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/manual
diff options
context:
space:
mode:
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/11_Scripting.md11
-rw-r--r--doc/manual/14_Appendix.md11
-rw-r--r--doc/manual/7_Modules.md4
-rw-r--r--doc/manual/9_Preferences.md25
4 files changed, 25 insertions, 26 deletions
diff --git a/doc/manual/11_Scripting.md b/doc/manual/11_Scripting.md
index c73819a8..6be71b7b 100644
--- a/doc/manual/11_Scripting.md
+++ b/doc/manual/11_Scripting.md
@@ -17,18 +17,15 @@ examples since Textadept is mostly written in Lua.
## Lua Configuration
-[Lua 5.1](http://www.lua.org/manual/5.1/) is built into Textadept. It has the
+[Lua 5.2](http://www.lua.org/manual/5.2/) is built into Textadept. It has the
same configuration (`luaconf.h`) as vanilla Lua with the following exceptions:
* `TA_LUA_PATH` and `TA_LUA_CPATH` are the environment variable used in place of
the usual `LUA_PATH` and `LUA_CPATH`.
* `LUA_ROOT` is `/usr/` in Linux systems instead of `/usr/local/`.
-* The `LUA_COMPAT_VARARG`, `LUA_COMPAT_MOD`, `LUA_COMPAT_GFIND`, and
- `LUA_COMPAT_OPENLIB` compatibility flags for Lua 5.0 are turned off.
-
-In addition, the [Lua Coco](http://coco.luajit.org/index.html) extension is used
-to allow coroutines to yield across the C call boundary, which would normally
-cause an error.
+* The `LUA_COMPAT_COMPAT`, `LUA_COMPAT_LOADERS`, `LUA_COMPAT_LOG10`,
+ `LUA_COMPAT_LOADSTRING`, and `LUA_COMPAT_MAXN` compatibility flags for Lua 5.1
+ are turned off.
## Scintilla
diff --git a/doc/manual/14_Appendix.md b/doc/manual/14_Appendix.md
index 71dacb1f..d19257d1 100644
--- a/doc/manual/14_Appendix.md
+++ b/doc/manual/14_Appendix.md
@@ -191,7 +191,7 @@ Ctrl+Shift+U, xxxx, Enter|None|Input Unicode character U-xxxx.
## Lua Patterns
The following is taken from the
-[Lua 5.1 Reference Manual](http://www.lua.org/manual/5.1/manual.html#5.4.1).
+[Lua 5.2 Reference Manual](http://www.lua.org/manual/5.2/manual.html#6.4.1).
_Character Class:_
@@ -204,13 +204,13 @@ combinations are allowed in describing a character class:
* **`%a`:** represents all letters.
* **`%c`:** represents all control characters.
* **`%d`:** represents all digits.
+* **`%g`:** represents all printable characters except space.
* **`%l`:** represents all lowercase letters.
* **`%p`:** represents all punctuation characters.
* **`%s`:** represents all space characters.
* **`%u`:** represents all uppercase letters.
* **`%w`:** represents all alphanumeric characters.
* **`%x`:** represents all hexadecimal digits.
-* **`%z`:** represents the character with representation 0.
* **`%`_`x`_:** (where _x_ is any non-alphanumeric character) represents the
character _x_. This is the standard way to escape the magic characters. Any
punctuation character (even the non magic) can be preceded by a '`%`' when
@@ -259,6 +259,11 @@ A _pattern item_ can be
counting +_1_ for an _x_ and -_1_ for a _y_, the ending _y_ is the first _y_
where the count reaches 0. For instance, the item `%b()` matches expressions
with balanced parentheses.
+* `%f[set]`, a _frontier pattern_; such item matches an empty string at any
+ position such that the next character belongs to _set_ and the previous
+ character does not belong to _set_. The set _set_ is interpreted as previously
+ described. The beginning and the end of the subject are handled as if they
+ were the character `'\0'`.
_Pattern:_
@@ -280,5 +285,3 @@ is captured with number 2, and the part matching "`%s*`" has number 3.
As a special case, the empty capture `()` captures the current string position
(a number). For instance, if we apply the pattern `"()aa()"` on the string
`"flaaap"`, there will be two captures: 3 and 5.
-
-A pattern cannot contain embedded zeros. Use `%z` instead.
diff --git a/doc/manual/7_Modules.md b/doc/manual/7_Modules.md
index 57845121..4885b9cd 100644
--- a/doc/manual/7_Modules.md
+++ b/doc/manual/7_Modules.md
@@ -135,9 +135,7 @@ a `post_init.lua` file. For example, instead of copying the `lua` module and
changing its `set_buffer_properties()` function to use tabs, you can do this
from `post_init.lua`:
- module('_m.lua', package.seeall)
-
- function set_buffer_properties()
+ function _m.lua.set_buffer_properties()
buffer.use_tabs = true
end
diff --git a/doc/manual/9_Preferences.md b/doc/manual/9_Preferences.md
index e86ba132..f94fff87 100644
--- a/doc/manual/9_Preferences.md
+++ b/doc/manual/9_Preferences.md
@@ -23,20 +23,21 @@ menu, replace
with
- require 'textadept.adeptsense'
- require 'textadept.bookmarks'
+ _m.textadept = {}
+ _m.textadept.adeptsense = require 'textadept.adeptsense'
+ _m.textadept.bookmarks = require 'textadept.bookmarks'
require 'textadept.command_entry'
- require 'textadept.editing'
+ _m.textadept.editing = require 'textadept.editing'
require 'textadept.find'
- require 'textadept.filter_through'
- require 'textadept.mime_types'
- require 'textadept.run'
- require 'textadept.session'
- require 'textadept.snapopen'
- require 'textadept.snippets'
-
- require 'textadept.keys'
- --require 'textadept.menu'
+ _m.textadept.filter_through = require 'textadept.filter_through'
+ _m.textadept.mime_types = require 'textadept.mime_types'
+ _m.textadept.run = require 'textadept.run'
+ _m.textadept.session = require 'textadept.session'
+ _m.textadept.snapopen = require 'textadept.snapopen'
+ _m.textadept.snippets = require 'textadept.snippets'
+
+ _m.textadept.keys = require 'textadept.keys'
+ --_m.textadept.menu = require 'textadept.menu'
Note that his list was obtained from the `textadept` module's `init.lua` which
is located in the `modules/textadept/` directory.