mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-28 08:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'Louisvh-develop' into develop

Browse source
This commit is contained in:
Sebastian Ramacher 2016-02-05 10:54:41 +01:00
commit b222aa4b05
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/man/zathurarc.5.rst
View file

@ -307,6 +307,13 @@ The following shortcut functions can be mapped:
Zoom in or out. Zoom in or out.
* ``mark_add``
Set a quickmark.
* ``mark_evaluate``
Go to a quickmark.
Pass arguments Pass arguments
^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
Some shortcut function require or have optional arguments which influence the Some shortcut function require or have optional arguments which influence the

2
zathura/config.c
View file

@ -466,6 +466,8 @@ config_load_default(zathura_t* zathura)
girara_shortcut_mapping_add(gsession, "goto", sc_goto); girara_shortcut_mapping_add(gsession, "goto", sc_goto);
girara_shortcut_mapping_add(gsession, "jumplist", sc_jumplist); girara_shortcut_mapping_add(gsession, "jumplist", sc_jumplist);
girara_shortcut_mapping_add(gsession, "bisect", sc_bisect); girara_shortcut_mapping_add(gsession, "bisect", sc_bisect);
girara_shortcut_mapping_add(gsession, "mark_add", sc_mark_add);
girara_shortcut_mapping_add(gsession, "mark_evaluate", sc_mark_evaluate);
girara_shortcut_mapping_add(gsession, "navigate", sc_navigate); girara_shortcut_mapping_add(gsession, "navigate", sc_navigate);
girara_shortcut_mapping_add(gsession, "navigate_index", sc_navigate_index); girara_shortcut_mapping_add(gsession, "navigate_index", sc_navigate_index);
girara_shortcut_mapping_add(gsession, "print", sc_print); girara_shortcut_mapping_add(gsession, "print", sc_print);

2
zathura/main.c
View file

@ -114,12 +114,10 @@ init_zathura(const char* config_dir, const char* data_dir,
return NULL; return NULL;
} }
#ifdef WITH_SYNCTEX
if (synctex_editor != NULL) { if (synctex_editor != NULL) {
girara_setting_set(zathura->ui.session, "synctex-editor-command", girara_setting_set(zathura->ui.session, "synctex-editor-command",
synctex_editor); synctex_editor);
} }
#endif
return zathura; return zathura;
} }