aboutsummaryrefslogtreecommitdiff
path: root/core/ext
diff options
context:
space:
mode:
Diffstat (limited to 'core/ext')
-rw-r--r--core/ext/pm/ctags_browser.lua12
-rw-r--r--core/ext/pm/file_browser.lua8
-rw-r--r--core/ext/pm/modules_browser.lua8
3 files changed, 14 insertions, 14 deletions
diff --git a/core/ext/pm/ctags_browser.lua b/core/ext/pm/ctags_browser.lua
index fb653ea7..e42f6129 100644
--- a/core/ext/pm/ctags_browser.lua
+++ b/core/ext/pm/ctags_browser.lua
@@ -21,11 +21,11 @@ local current_file, current_dir
-- * The GTK stock-id for the pixbuf to display next to the identifier in the
-- tree view (pixbuf key).
-- * The display text used for displaying the identifier in the tree view
--- (display_text key).
+-- (text key).
-- * Boolean parent value if the identifier is a container.
-- * The line number or pattern used to goto the identifier.
-- Note this table is returned by get_contents_for, but only 'pixbuf',
--- 'display_text' and 'parent' fields are read; all others are ignored.
+-- 'text' and 'parent' fields are read; all others are ignored.
-- @class table
-- @name tags
local tags
@@ -169,9 +169,9 @@ function get_contents_for(full_path, expanding)
-- This identifier belongs to a container, so define the
-- container if it hasn't been already and place this identifier
-- in it. Just in case there is no ctag entry for container later
- -- on, define 'parent' and 'display_text'.
+ -- on, define 'parent' and 'text'.
if not tags[val] then
- tags[val] = { parent = true, display_text = val }
+ tags[val] = { parent = true, text = val }
end
local parent = tags[val]
if not parent.children then parent.children = {} end
@@ -179,7 +179,7 @@ function get_contents_for(full_path, expanding)
entry.set = true
end
end
- entry.display_text = name
+ entry.text = name
-- The following keys are ignored by caller.
entry.filepath = filepath:sub(1, 1) == '/' and
filepath or current_dir..filepath
@@ -213,7 +213,7 @@ function perform_action(selected_item)
buffer:ensure_visible_enforce_policy(line)
buffer:goto_line(line)
else
- error(item.display_text..' not found.')
+ error(item.text..' not found.')
end
elseif item.line_num then
textadept.io.open(item.filepath)
diff --git a/core/ext/pm/file_browser.lua b/core/ext/pm/file_browser.lua
index da2644d0..caae33f6 100644
--- a/core/ext/pm/file_browser.lua
+++ b/core/ext/pm/file_browser.lua
@@ -30,11 +30,11 @@ function get_contents_for(full_path)
local name = entry:sub(1, -2)
dir[name] = {
parent = true,
- display_text = name,
+ text = name,
pixbuf = 'gtk-directory'
}
else
- dir[entry] = { display_text = entry }
+ dir[entry] = { text = entry }
end
end
else
@@ -48,7 +48,7 @@ function get_contents_for(full_path)
for name in out:gmatch('[^\n]+') do
dir[name] = {
parent = true,
- display_text = name,
+ text = name,
pixbuf = 'gtk-directory'
}
end
@@ -56,7 +56,7 @@ function get_contents_for(full_path)
out = p:read('*all')
p:close()
for entry in out:gmatch('[^\n]+') do
- dir[entry] = { display_text = entry }
+ dir[entry] = { text = entry }
end
end
return dir
diff --git a/core/ext/pm/modules_browser.lua b/core/ext/pm/modules_browser.lua
index 9c0c8992..0456feaf 100644
--- a/core/ext/pm/modules_browser.lua
+++ b/core/ext/pm/modules_browser.lua
@@ -32,11 +32,11 @@ function get_contents_for(full_path)
local name = entry:sub(1, -2)
dir[name] = {
parent = true,
- display_text = name,
+ text = name,
pixbuf = 'gtk-directory'
}
else
- dir[entry] = { display_text = entry }
+ dir[entry] = { text = entry }
end
end
else
@@ -50,7 +50,7 @@ function get_contents_for(full_path)
for name in out:gmatch('[^\n]+') do
dir[name] = {
parent = true,
- display_text = name,
+ text = name,
pixbuf = 'gtk-directory'
}
end
@@ -58,7 +58,7 @@ function get_contents_for(full_path)
out = p:read('*all')
p:close()
for entry in out:gmatch('[^\n]+') do
- dir[entry] = { display_text = entry }
+ dir[entry] = { text = entry }
end
end
return dir