Plugins-Commits August 2018

plugins-commits@lists.geany.org

1 participants
9 discussions

[geany/geany-plugins] 65475d: po: Update strings after 6bb7523baa1b3c67fa2e8438f95d3ab4503bbdbb
by Colomban Wendling 31 Aug '18

31 Aug '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 31 Aug 2018 13:31:02 UTC Commit: 65475dac74800f8e07d0102beeb64ed1a2612212 https://github.com/geany/geany-plugins/commit/65475dac74800f8e07d0102beeb64… Log Message: ----------- po: Update strings after 6bb7523baa1b3c67fa2e8438f95d3ab4503bbdbb This avoids unnecessary burden on the translators for a typo in the original string. Modified Paths: -------------- po/be.po po/ca.po po/da.po po/de.po po/el.po po/es.po po/fr.po po/gl.po po/it.po po/ja.po po/kk.po po/nl.po po/pt.po po/pt_BR.po po/ru.po po/tr.po po/zh_CN.po Modified: po/be.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4570,7 +4570,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" Modified: po/ca.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4498,7 +4498,7 @@ msgstr "Annexar el menú a la barra d'eines" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" Modified: po/da.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4509,7 +4509,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" Modified: po/de.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4811,7 +4811,7 @@ msgstr "Menü an Menüleiste anhängen" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Das Menü für dieses Plugin kann entweder im Werkzeugmenü oder direkt in der " Modified: po/el.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4471,7 +4471,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" Modified: po/es.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4786,7 +4786,7 @@ msgstr "Añadir menú a la barra de menús" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Indica si el menú de este plugin se colocará dentro del menú de herramientas " Modified: po/fr.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4798,7 +4798,7 @@ msgstr "Attacher le menu à la barre de menu" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Choisit si le menu du plugin est placé dans le menu « Outils » ou " Modified: po/gl.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4737,7 +4737,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" Modified: po/it.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4741,7 +4741,7 @@ msgstr "Poni menu nella menubar" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Imposta se il menu per questo plugin deve essere posizionato all'interno del " Modified: po/ja.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4663,7 +4663,7 @@ msgstr "メニューをメニューバーに追加" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "このプラグインのメニューがツールメニューの中に表示されるかGeanyのメニューバー" Modified: po/kk.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4472,7 +4472,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" Modified: po/nl.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4537,7 +4537,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" Modified: po/pt.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4775,7 +4775,7 @@ msgstr "Anexar menu à barra de menus" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Se o menu da extensão é colocado dentro do menu Ferramentas ou directamente " Modified: po/pt_BR.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4748,7 +4748,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" Modified: po/ru.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4731,7 +4731,7 @@ msgstr "Разместить меню на главной панели" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" "Располагать меню данного модуля либо внутри меню Инструменты либо " Modified: po/tr.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4576,7 +4576,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" Modified: po/zh_CN.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4735,7 +4735,7 @@ msgstr "" #: ../geanyvc/src/geanyvc.c:1950 msgid "" "Whether menu for this plugin are getting placed either inside tools menu or " -"directly inside Geany's menubar.Will take in account after next start of " +"directly inside Geany's menubar. Will take in account after next start of " "GeanyVC" msgstr "" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 6f5e58: Workbench: Move a few leading space in translateable strings
by Frank Lanitz 31 Aug '18

31 Aug '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Fri, 31 Aug 2018 13:04:09 UTC Commit: 6f5e5879d39d5628bf0e6b9d3bd4795d432e2b5f https://github.com/geany/geany-plugins/commit/6f5e5879d39d5628bf0e6b9d3bd47… Log Message: ----------- Workbench: Move a few leading space in translateable strings Modified Paths: -------------- workbench/src/dialogs.c Modified: workbench/src/dialogs.c 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -434,25 +434,25 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) w_rescan_projects_on_open = gtk_check_button_new_with_mnemonic(_("_Rescan all projects on open")); ui_table_add_row(GTK_TABLE(table), 0, w_rescan_projects_on_open, NULL); gtk_widget_set_tooltip_text(w_rescan_projects_on_open, - _("If the option is activated (default), then all projects will be re-scanned" - " on opening of the workbench.")); + _("If the option is activated (default), then all projects will be re-scanned " + "on opening of the workbench.")); rescan_projects_on_open_old = workbench_get_rescan_projects_on_open(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_rescan_projects_on_open), rescan_projects_on_open_old); w_enable_live_update = gtk_check_button_new_with_mnemonic(_("_Enable live update")); ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); gtk_widget_set_tooltip_text(w_enable_live_update, - _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed. " + _("If the option is activated (default), then the list of files and the sidebar " + "will be updated automatically if a file or directory is created, removed or renamed. " "A manual re-scan is not required if the option is enabled.")); enable_live_update_old = workbench_get_enable_live_update(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_enable_live_update), enable_live_update_old); w_expand_on_hover = gtk_check_button_new_with_mnemonic(_("_Expand on hover")); ui_table_add_row(GTK_TABLE(table), 2, w_expand_on_hover, NULL); gtk_widget_set_tooltip_text(w_expand_on_hover, - _("If the option is activated, then a tree node in the sidebar" - " will be expanded or collapsed by hovering over it with the mouse cursor.")); + _("If the option is activated, then a tree node in the sidebar " + "will be expanded or collapsed by hovering over it with the mouse cursor.")); expand_on_hover_old = workbench_get_expand_on_hover(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_expand_on_hover), expand_on_hover_old); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 71b585: Merge pull request #769 from Skif-off/typos-transl
by Frank Lanitz 31 Aug '18

31 Aug '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Fri, 31 Aug 2018 12:54:33 UTC Commit: 71b585b3858b3c2af3cedb402a597721b2c677de https://github.com/geany/geany-plugins/commit/71b585b3858b3c2af3cedb402a597… Log Message: ----------- Merge pull request #769 from Skif-off/typos-transl FIX: Spaces after dots in translatable strings Modified Paths: -------------- geanyvc/src/geanyvc.c workbench/src/dialogs.c Modified: geanyvc/src/geanyvc.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1948,7 +1948,7 @@ plugin_configure(GtkDialog * dialog) widgets.cb_attach_to_menubar = gtk_check_button_new_with_label(_("Attach menu to menubar")); gtk_widget_set_tooltip_text(widgets.cb_editor_menu_entries, _("Whether menu for this plugin are getting placed either " - "inside tools menu or directly inside Geany's menubar." + "inside tools menu or directly inside Geany's menubar. " "Will take in account after next start of GeanyVC")); gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_attach_to_menubar), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_attach_to_menubar), Modified: workbench/src/dialogs.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -443,7 +443,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed." + " will be updated automatically if a file or directory is created, removed or renamed. " "A manual re-scan is not required if the option is enabled.")); enable_live_update_old = workbench_get_enable_live_update(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_enable_live_update), enable_live_update_old); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 6bb752: FIX: Spaces after dots in translatable strings
by Skif-off 31 Aug '18

31 Aug '18

Branch: refs/heads/master Author: Skif-off <Skif-off(a)users.noreply.github.com> Committer: Skif-off <Skif-off(a)users.noreply.github.com> Date: Fri, 31 Aug 2018 12:36:12 UTC Commit: 6bb7523baa1b3c67fa2e8438f95d3ab4503bbdbb https://github.com/geany/geany-plugins/commit/6bb7523baa1b3c67fa2e8438f95d3… Log Message: ----------- FIX: Spaces after dots in translatable strings Modified Paths: -------------- geanyvc/src/geanyvc.c workbench/src/dialogs.c Modified: geanyvc/src/geanyvc.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1948,7 +1948,7 @@ plugin_configure(GtkDialog * dialog) widgets.cb_attach_to_menubar = gtk_check_button_new_with_label(_("Attach menu to menubar")); gtk_widget_set_tooltip_text(widgets.cb_editor_menu_entries, _("Whether menu for this plugin are getting placed either " - "inside tools menu or directly inside Geany's menubar." + "inside tools menu or directly inside Geany's menubar. " "Will take in account after next start of GeanyVC")); gtk_button_set_focus_on_click(GTK_BUTTON(widgets.cb_attach_to_menubar), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.cb_attach_to_menubar), Modified: workbench/src/dialogs.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -443,7 +443,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed." + " will be updated automatically if a file or directory is created, removed or renamed. " "A manual re-scan is not required if the option is enabled.")); enable_live_update_old = workbench_get_enable_live_update(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_enable_live_update), enable_live_update_old); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e17b6e: Windows Installer: Update removal list of unnecessary/uninstall files
by Enrico Tröger 20 Aug '18

20 Aug '18

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 19 Aug 2018 21:45:17 UTC Commit: e17b6ef25197983fef6ddde3e4df7deac9efb81a https://github.com/geany/geany-plugins/commit/e17b6ef25197983fef6ddde3e4df7… Log Message: ----------- Windows Installer: Update removal list of unnecessary/uninstall files Modified Paths: -------------- build/geany-plugins.nsi build/gtk-bundle-from-msys2.sh Modified: build/geany-plugins.nsi 27 lines changed, 15 insertions(+), 12 deletions(-) =================================================================== @@ -38,7 +38,7 @@ RequestExecutionLevel highest ; set execution level for Windows Vista !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_DIR_REGKEY "Software\Geany-Plugins" !define GEANY_DIR_REGKEY "Software\Geany" -!define REQUIRED_GEANY_VERSION "1.33.0" +!define REQUIRED_GEANY_VERSION "1.34.0" !define RESOURCEDIR "geany-plugins-${PRODUCT_VERSION}" ;;;;;;;;;;;;;;;;;;;;; @@ -213,7 +213,7 @@ Section Uninstall Delete "$INSTDIR\bin\libdbus-1-3.dll" Delete "$INSTDIR\bin\libdbus-glib-1-2.dll" Delete "$INSTDIR\bin\libeay32.dll" - Delete "$INSTDIR\bin\libenchant.dll" + Delete "$INSTDIR\bin\libenchant-2.dll" Delete "$INSTDIR\bin\libexslt-0.dll" Delete "$INSTDIR\bin\libgcrypt-20.dll" Delete "$INSTDIR\bin\libgeoclue-0.dll" @@ -234,6 +234,7 @@ Section Uninstall Delete "$INSTDIR\bin\libgstcheck-1.0-0.dll" Delete "$INSTDIR\bin\libgstcontroller-1.0-0.dll" Delete "$INSTDIR\bin\libgstfft-1.0-0.dll" + Delete "$INSTDIR\bin\libgstgl-1.0-0.dll" Delete "$INSTDIR\bin\libgstnet-1.0-0.dll" Delete "$INSTDIR\bin\libgstpbutils-1.0-0.dll" Delete "$INSTDIR\bin\libgstreamer-1.0-0.dll" @@ -249,14 +250,14 @@ Section Uninstall Delete "$INSTDIR\bin\libhogweed-4.dll" Delete "$INSTDIR\bin\libhttp_parser-2.dll" Delete "$INSTDIR\bin\libhunspell-1.6-0.dll" - Delete "$INSTDIR\bin\libicudt58.dll" - Delete "$INSTDIR\bin\libicuin58.dll" - Delete "$INSTDIR\bin\libicuio58.dll" - Delete "$INSTDIR\bin\libicule58.dll" - Delete "$INSTDIR\bin\libiculx58.dll" - Delete "$INSTDIR\bin\libicutest58.dll" - Delete "$INSTDIR\bin\libicutu58.dll" - Delete "$INSTDIR\bin\libicuuc58.dll" + Delete "$INSTDIR\bin\libicudt61.dll" + Delete "$INSTDIR\bin\libicuin61.dll" + Delete "$INSTDIR\bin\libicuio61.dll" + Delete "$INSTDIR\bin\libicule61.dll" + Delete "$INSTDIR\bin\libiculx61.dll" + Delete "$INSTDIR\bin\libicutest61.dll" + Delete "$INSTDIR\bin\libicutu61.dll" + Delete "$INSTDIR\bin\libicuuc61.dll" Delete "$INSTDIR\bin\libidn2-0.dll" Delete "$INSTDIR\bin\libjavascriptcoregtk-1.0-0.dll" Delete "$INSTDIR\bin\libjavascriptcoregtk-3.0-0.dll" @@ -283,7 +284,7 @@ Section Uninstall Delete "$INSTDIR\bin\libtiff-5.dll" Delete "$INSTDIR\bin\libtiffxx-5.dll" Delete "$INSTDIR\bin\libtre-5.dll" - Delete "$INSTDIR\bin\libturbojpeg-0.dll" + Delete "$INSTDIR\bin\libturbojpeg.dll" Delete "$INSTDIR\bin\libunistring-2.dll" Delete "$INSTDIR\bin\libvorbis-0.dll" Delete "$INSTDIR\bin\libvorbisenc-2.dll" @@ -301,7 +302,7 @@ Section Uninstall Delete "$INSTDIR\bin\lua51.dll" Delete "$INSTDIR\bin\ssleay32.dll" - RMDir /r "$INSTDIR\lib\enchant" + RMDir /r "$INSTDIR\lib\enchant-2" RMDir /r "$INSTDIR\lib\engines" RMDir /r "$INSTDIR\lib\gio" RMDir /r "$INSTDIR\lib\gstreamer-1.0" @@ -316,6 +317,7 @@ Section Uninstall RMDir /r "$INSTDIR\share\vala" RMDir /r "$INSTDIR\share\webkitgtk-1.0" RMDir /r "$INSTDIR\share\webkitgtk-3.0" + RMDir /r "$INSTDIR\share\xml\dbus-1" FindFirst $0 $1 "$INSTDIR\share\locale\*" loop: @@ -347,6 +349,7 @@ Section Uninstall RMDir "$INSTDIR\share\icons\hicolor" RMDir "$INSTDIR\share\icons" RMDir "$INSTDIR\share\locale" + RMDir "$INSTDIR\share\xml" RMDir "$INSTDIR\share" RMDir "$INSTDIR" Modified: build/gtk-bundle-from-msys2.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -217,7 +217,7 @@ cleanup_unnecessary_files() { rm -rf lib/lua rm -rf lib/p11-kit rm -rf lib/python2.7 - rm -rf lib/python3.6 + rm -rf lib/python3.7 find lib -name '*.h' -delete find lib -name '*.a' -delete find lib -name '*.typelib' -delete -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 77a5c9: vimode: When wrapping is on, "k" should go to the first line of wrapping
by Jiří Techet 12 Aug '18

12 Aug '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 14 Jun 2018 11:55:56 UTC Commit: 77a5c96af5680870026ea273e2ade7e42aaed04f https://github.com/geany/geany-plugins/commit/77a5c96af5680870026ea273e2ade… Log Message: ----------- vimode: When wrapping is on, "k" should go to the first line of wrapping Check the comments in the source for more details. Modified Paths: -------------- vimode/src/cmds/motion.c Modified: vimode/src/cmds/motion.c 48 lines changed, 38 insertions(+), 10 deletions(-) =================================================================== @@ -43,20 +43,48 @@ void cmd_goto_right(CmdContext *c, CmdParams *p) void cmd_goto_up(CmdContext *c, CmdParams *p) { - gint one_below, pos; + gint one_above, pos; if (p->line == 0) return; - /* Calling SCI_LINEUP in a loop for num lines leads to visible slow scrolling. - * On the other hand, SCI_LINEUP preserves the value of SCI_CHOOSECARETX - * we want to keep - perform jump to previous line and one final SCI_LINEUP - * which recovers SCI_CHOOSECARETX for us. */ - one_below = p->line - p->num + 1; - one_below = one_below > 0 ? one_below : 1; - pos = SSM(p->sci, SCI_POSITIONFROMLINE, one_below, 0); - SET_POS_NOX(p->sci, pos, FALSE); - SSM(p->sci, SCI_LINEUP, 0, 0); + /* Calling SCI_LINEUP/SCI_LINEDOWN in a loop for num lines leads to visible + * slow scrolling. On the other hand, SCI_LINEUP preserves the value of + * SCI_CHOOSECARETX which we cannot read directly from Scintilla and which + * we want to keep - perform jump to previous/following line and add + * one final SCI_LINEUP/SCI_LINEDOWN which recovers SCI_CHOOSECARETX for us. */ + one_above = p->line - p->num - 1; + if (one_above >= 0) + { + /* Every case except for the first line - go one line above and perform + * SCI_LINEDOWN. This ensures that even with wrapping on, we get the + * caret on the first line of the wrapped line */ + pos = SSM(p->sci, SCI_GETLINEENDPOSITION, one_above, 0); + SET_POS_NOX(p->sci, pos, FALSE); + SSM(p->sci, SCI_LINEDOWN, 0, 0); + } + else + { + /* This is the first line and there is no line above - we need to go to + * the following line and do SCI_LINEUP. In addition, when wrapping is + * on, we need to repeat SCI_LINEUP to get to the first line of wrapping. + * This may lead to visible slow scrolling which is why there's the + * fast case above for anything else but the first line. */ + gint one_below = p->line - p->num + 1; + gint wrap_count; + + one_below = one_below > 0 ? one_below : 1; + pos = SSM(p->sci, SCI_POSITIONFROMLINE, one_below, 0); + SET_POS_NOX(p->sci, pos, FALSE); + SSM(p->sci, SCI_LINEUP, 0, 0); + + wrap_count = SSM(p->sci, SCI_WRAPCOUNT, GET_CUR_LINE(p->sci), 0); + while (wrap_count > 1) + { + SSM(p->sci, SCI_LINEUP, 0, 0); + wrap_count--; + } + } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 56113b: Merge pull request #754 from techee/vim_k
by Frank Lanitz 12 Aug '18

12 Aug '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 12 Aug 2018 08:46:24 UTC Commit: 56113bfb3f701721c0e159ac561178dabbe55c86 https://github.com/geany/geany-plugins/commit/56113bfb3f701721c0e159ac56117… Log Message: ----------- Merge pull request #754 from techee/vim_k vimode: When wrapping is on, "k" should go to the first line of wrapping Modified Paths: -------------- vimode/src/cmds/motion.c Modified: vimode/src/cmds/motion.c 48 lines changed, 38 insertions(+), 10 deletions(-) =================================================================== @@ -43,20 +43,48 @@ void cmd_goto_right(CmdContext *c, CmdParams *p) void cmd_goto_up(CmdContext *c, CmdParams *p) { - gint one_below, pos; + gint one_above, pos; if (p->line == 0) return; - /* Calling SCI_LINEUP in a loop for num lines leads to visible slow scrolling. - * On the other hand, SCI_LINEUP preserves the value of SCI_CHOOSECARETX - * we want to keep - perform jump to previous line and one final SCI_LINEUP - * which recovers SCI_CHOOSECARETX for us. */ - one_below = p->line - p->num + 1; - one_below = one_below > 0 ? one_below : 1; - pos = SSM(p->sci, SCI_POSITIONFROMLINE, one_below, 0); - SET_POS_NOX(p->sci, pos, FALSE); - SSM(p->sci, SCI_LINEUP, 0, 0); + /* Calling SCI_LINEUP/SCI_LINEDOWN in a loop for num lines leads to visible + * slow scrolling. On the other hand, SCI_LINEUP preserves the value of + * SCI_CHOOSECARETX which we cannot read directly from Scintilla and which + * we want to keep - perform jump to previous/following line and add + * one final SCI_LINEUP/SCI_LINEDOWN which recovers SCI_CHOOSECARETX for us. */ + one_above = p->line - p->num - 1; + if (one_above >= 0) + { + /* Every case except for the first line - go one line above and perform + * SCI_LINEDOWN. This ensures that even with wrapping on, we get the + * caret on the first line of the wrapped line */ + pos = SSM(p->sci, SCI_GETLINEENDPOSITION, one_above, 0); + SET_POS_NOX(p->sci, pos, FALSE); + SSM(p->sci, SCI_LINEDOWN, 0, 0); + } + else + { + /* This is the first line and there is no line above - we need to go to + * the following line and do SCI_LINEUP. In addition, when wrapping is + * on, we need to repeat SCI_LINEUP to get to the first line of wrapping. + * This may lead to visible slow scrolling which is why there's the + * fast case above for anything else but the first line. */ + gint one_below = p->line - p->num + 1; + gint wrap_count; + + one_below = one_below > 0 ? one_below : 1; + pos = SSM(p->sci, SCI_POSITIONFROMLINE, one_below, 0); + SET_POS_NOX(p->sci, pos, FALSE); + SSM(p->sci, SCI_LINEUP, 0, 0); + + wrap_count = SSM(p->sci, SCI_WRAPCOUNT, GET_CUR_LINE(p->sci), 0); + while (wrap_count > 1) + { + SSM(p->sci, SCI_LINEUP, 0, 0); + wrap_count--; + } + } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 59db92: vimode: Fix goto_down with line wrapping
by pcworld 12 Aug '18

12 Aug '18

Branch: refs/heads/master Author: pcworld <0188801(a)gmail.com> Committer: pcworld <0188801(a)gmail.com> Date: Thu, 31 May 2018 19:47:25 UTC Commit: 59db92abc07a127e337ac848ca6ffee3788ed65f https://github.com/geany/geany-plugins/commit/59db92abc07a127e337ac848ca6ff… Log Message: ----------- vimode: Fix goto_down with line wrapping SCI_LINEDOWN goes down only one display line, hence when line wrapping was enabled and a line wrapped over more than two lines, it was impossible to go to the next actual line when pressing j. Note that this still doesn't emulate vim behavior correctly where caret-x position is saved for actual lines and not display lines. But this change at least makes j go the next line when wrapping is enabled. Modified Paths: -------------- vimode/src/cmds/motion.c Modified: vimode/src/cmds/motion.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -78,7 +78,7 @@ static void goto_down(CmdParams *p, gint num) /* see cmd_goto_up() for explanation */ one_above = p->line + num - 1; one_above = one_above < last_line ? one_above : last_line - 1; - pos = SSM(p->sci, SCI_POSITIONFROMLINE, one_above, 0); + pos = SSM(p->sci, SCI_GETLINEENDPOSITION, one_above, 0); SET_POS_NOX(p->sci, pos, FALSE); SSM(p->sci, SCI_LINEDOWN, 0, 0); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c458ad: Merge pull request #748 from pcworld/vimode-gotodown-fix
by Frank Lanitz 12 Aug '18

12 Aug '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 12 Aug 2018 08:46:02 UTC Commit: c458ad69635c2b5bf22e63b06c0c63ce377e5b20 https://github.com/geany/geany-plugins/commit/c458ad69635c2b5bf22e63b06c0c6… Log Message: ----------- Merge pull request #748 from pcworld/vimode-gotodown-fix vimode: Fix goto_down with line wrapping Modified Paths: -------------- vimode/src/cmds/motion.c Modified: vimode/src/cmds/motion.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -78,7 +78,7 @@ static void goto_down(CmdParams *p, gint num) /* see cmd_goto_up() for explanation */ one_above = p->line + num - 1; one_above = one_above < last_line ? one_above : last_line - 1; - pos = SSM(p->sci, SCI_POSITIONFROMLINE, one_above, 0); + pos = SSM(p->sci, SCI_GETLINEENDPOSITION, one_above, 0); SET_POS_NOX(p->sci, pos, FALSE); SSM(p->sci, SCI_LINEDOWN, 0, 0); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits August 2018