Merge branch 'develop' of pwmt.org:zathura into develop

This commit is contained in:
Moritz Lipp 2012-08-05 15:16:57 +02:00
commit 38ef6ff598
2 changed files with 6 additions and 4 deletions

View File

@ -60,7 +60,7 @@ list_files(zathura_t* zathura, const char* current_path, const char* current_fil
goto error_free;
}
int e_length = strlen(e_name);
size_t e_length = strlen(e_name);
if (show_hidden == false && e_name[0] == '.') {
g_free(e_name);
@ -112,7 +112,7 @@ error_free:
return NULL;
}
girara_completion_t*
static girara_completion_t*
list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext)
{
girara_completion_t* completion = girara_completion_init();

View File

@ -13,7 +13,7 @@ a document viewer
SYNOPOSIS
=========
| zathura [OPTION]...
| zathura [OPTION]... FILE
| zathura [OPTION]... FILE [FILE ...]
DESCRIPTION
===========
@ -37,7 +37,9 @@ OPTIONS
Path to the directory containing plugins
-w [password], --password [password]
The documents password
The documents password. If multiple documents are opened at once, the password
will be used for the first one and zathura will ask for the passwords of the
remaining files if needed.
--fork
Fork into the background