Merge pull request #748 from blueyed/minor

Minor doc/style fixes
This commit is contained in:
Daniel Hahler 2016-03-06 15:10:53 +01:00
commit 7fce4ba7dd
4 changed files with 8 additions and 9 deletions

View File

@ -24,7 +24,7 @@ function common.create_buttons(buttons, object)
local btns = {}
for _, b in ipairs(buttons) do
-- Create a proxy button object: it will receive the real
-- press and release events, and will propagate them the the
-- press and release events, and will propagate them to the
-- button object the user provided, but with the object as
-- argument.
local btn = capi.button { modifiers = b.modifiers, button = b.button }

View File

@ -112,9 +112,8 @@ function beautiful.init(config)
if config then
local homedir = os.getenv("HOME")
-- If config is the path to the theme file,
-- run this file,
-- else if it is the theme table, save it
-- If `config` is the path to a theme file, run this file,
-- otherwise if it is a theme table, save it.
if type(config) == 'string' then
-- Expand the '~' $HOME shortcut
config = config:gsub("^~/", homedir .. "/")

View File

@ -215,7 +215,7 @@ function ratio:set_ratio(index, percent)
self:emit_signal("widget::layout_changed")
end
--- The the ratio at `index`
--- Get the ratio at `index`.
-- @tparam number index The widget index to query
-- @treturn number The index (between 0 and 1)
function ratio:get_ratio(index)
@ -223,9 +223,9 @@ function ratio:get_ratio(index)
return self._ratios[index]
end
--- Set the ratio of "widget"
-- @param widget The widget to ajust
-- @tparam number percent An floating point value between 0 and 1
--- Set the ratio of `widget` to `percent`.
-- @tparam widget widget The widget to ajust.
-- @tparam number percent A floating point value between 0 and 1.
function ratio:set_widget_ratio(widget, percent)
local index = self:index(widget)

2
luaa.c
View File

@ -399,7 +399,7 @@ luaA_dofunction_on_error(lua_State *L)
/* emit error signal */
signal_object_emit(L, &global_signals, "debug::error", 1);
if(!luaL_dostring(L, "return debug.traceback(\"error while running function\", 3)"))
if(!luaL_dostring(L, "return debug.traceback(\"error while running function!\", 3)"))
{
/* Move traceback before error */
lua_insert(L, -2);