Plugins-Commits September 2021

plugins-commits@lists.geany.org

1 participants
40 discussions

[geany/geany-plugins] 21835b: vimode: document the newly added ex commands
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 02 Sep 2021 19:43:01 UTC Commit: 21835b79c34e9967598bf7c862976def62698926 https://github.com/geany/geany-plugins/commit/21835b79c34e9967598bf7c862976… Log Message: ----------- vimode: document the newly added ex commands Modified Paths: -------------- vimode/README Modified: vimode/README 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -550,16 +550,28 @@ a new command, please do not forget to update the table below.:: tag command action ------------------------------------------------------------------------------ :& :& repeat last ":substitute" + :< :< shift lines one 'shiftwidth' left + :> :> shift lines one 'shiftwidth' right + :copy :co[py] copy lines :cquit :cq[uit] quit Vim with an error code + :delete :d[elete] delete lines :exit :exi[t] same as ":xit" + :join :j[oin] join lines + :move :m[ove] move lines + :put :pu[t] insert contents of register in the text :quit :q[uit] quit current window (when one window quit Vim) :quitall :quita[ll] quit Vim :qall :qa[ll] quit Vim + :redo :red[o] redo one undone change :substitute :s[ubstitute] find and replace text + :t :t same as ":copy" + :undo :u[ndo] undo last change(s) :update :up[date] write buffer if modified :write :w[rite] write to a file :wall :wa[ll] write all (changed) buffers :wq :wq write to a file and quit window or Vim :wqall :wqa[ll] write all changed buffers and quit Vim :xit :x[it] write if buffer changed and quit window or Vim :xall :xa[ll] same as ":wqall" + :yank :y[ank] yank lines into a register + :~ :~ repeat last ":substitute" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ef848d: Merge pull request #1104 from techee/vim_selection_char_problem
by Frank Lanitz 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 29 Sep 2021 17:10:45 UTC Commit: ef848d838858ce0150e86481d46bc75b3dd390a7 https://github.com/geany/geany-plugins/commit/ef848d838858ce0150e86481d46bc… Log Message: ----------- Merge pull request #1104 from techee/vim_selection_char_problem vimode: Add special handling to include destination char for some commands Modified Paths: -------------- vimode/src/cmd-runner.c Modified: vimode/src/cmd-runner.c 24 lines changed, 23 insertions(+), 1 deletions(-) =================================================================== @@ -167,6 +167,21 @@ typedef struct { /* END */ +/* From the above commands, these commands also include the character + * where the destionation movement ends for motion commands (e.g. 'de' will + * delete the word including the last character) */ +CmdDef include_dest_char_movement_cmds[] = { + {cmd_goto_next_char, GDK_KEY_f, 0, 0, 0, TRUE, FALSE}, + {cmd_goto_next_char_before, GDK_KEY_t, 0, 0, 0, TRUE, FALSE}, + {cmd_goto_next_word_end, GDK_KEY_e, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_next_word_end_space, GDK_KEY_E, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_previous_word, GDK_KEY_b, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_previous_word_space, GDK_KEY_B, 0, 0, 0, FALSE, FALSE}, + {cmd_goto_matching_brace, GDK_KEY_percent, 0, 0, 0, FALSE, FALSE}, + {NULL, 0, 0, 0, 0, FALSE, FALSE} +}; + + CmdDef movement_cmds[] = { MOVEMENT_CMDS {NULL, 0, 0, 0, 0, FALSE, FALSE} @@ -567,7 +582,8 @@ static void perform_cmd(CmdDef *def, CmdContext *ctx) if (VI_IS_COMMAND(vi_get_mode())) { gboolean is_text_object_cmd = is_in_cmd_group(text_object_cmds, def); - if (is_text_object_cmd ||is_in_cmd_group(movement_cmds, def)) + gboolean is_include_dest_char_movement_cmd = is_in_cmd_group(include_dest_char_movement_cmds, def); + if (is_text_object_cmd || is_in_cmd_group(movement_cmds, def)) { def = get_cmd_to_run(top, operator_cmds, TRUE); if (def) @@ -585,6 +601,12 @@ static void perform_cmd(CmdDef *def, CmdContext *ctx) { sel_start = MIN(new_pos, orig_pos); sel_len = ABS(new_pos - orig_pos); + if (sel_len > 0 && is_include_dest_char_movement_cmd) + { + sel_len++; + if (new_pos < orig_pos) + sel_start--; + } } cmd_params_init(&param, ctx->sci, 1, FALSE, top, TRUE, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4828bc: vimode: add a few extra excmd commands
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 02 Sep 2021 15:23:17 UTC Commit: 4828bc329500a1f59fe669a8fe023a009d7e5a98 https://github.com/geany/geany-plugins/commit/4828bc329500a1f59fe669a8fe023… Log Message: ----------- vimode: add a few extra excmd commands This patch adds the following commands: :y[ank] :pu[t] :u[ndo] :red[o] :< :> :d[elete] :j[oin] Modified Paths: -------------- vimode/src/cmd-params.c vimode/src/cmds/excmds.c vimode/src/cmds/excmds.h vimode/src/excmd-runner.c Modified: vimode/src/cmd-params.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,7 @@ void cmd_params_init(CmdParams *param, ScintillaObject *sci, param->num = num; param->num_present = num_present; - param->last_kp = g_slist_nth_data(kpl, 0); + param->last_kp = kpl != NULL ? g_slist_nth_data(kpl, 0) : NULL; param->is_operator_cmd = is_operator_cmd; param->sel_start = sel_start; Modified: vimode/src/cmds/excmds.c 69 lines changed, 69 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,7 @@ */ #include "cmds/excmds.h" +#include "cmds/edit.h" #include "utils.h" void excmd_save(CmdContext *c, ExCmdParams *p) @@ -64,3 +65,71 @@ void excmd_repeat_subst_orig_flags(CmdContext *c, ExCmdParams *p) { perform_substitute(c->sci, c->substitute_text, p->range_from, p->range_to, NULL); } + + +static void prepare_cmd_params(CmdParams *params, CmdContext *c, ExCmdParams *p) +{ + gint start = SSM(c->sci, SCI_POSITIONFROMLINE, p->range_from, 0); + SET_POS(c->sci, start, TRUE); + cmd_params_init(params, c->sci, p->range_to - p->range_from + 1, FALSE, NULL, FALSE, 0, 0); +} + + +void excmd_yank(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_copy_line(c, &params); +} + + +void excmd_put(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_paste_after(c, &params); +} + + +void excmd_undo(CmdContext *c, ExCmdParams *p) +{ + SSM(c->sci, SCI_UNDO, 0, 0); +} + + +void excmd_redo(CmdContext *c, ExCmdParams *p) +{ + SSM(c->sci, SCI_REDO, 0, 0); +} + + +void excmd_shift_left(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_unindent(c, &params); +} + + +void excmd_shift_right(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_indent(c, &params); +} + + +void excmd_delete(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_delete_line(c, &params); +} + +void excmd_join(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_join_lines(c, &params); +} + Modified: vimode/src/cmds/excmds.h 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -29,5 +29,13 @@ void excmd_save_quit(CmdContext *c, ExCmdParams *p); void excmd_save_all_quit(CmdContext *c, ExCmdParams *p); void excmd_repeat_subst(CmdContext *c, ExCmdParams *p); void excmd_repeat_subst_orig_flags(CmdContext *c, ExCmdParams *p); +void excmd_yank(CmdContext *c, ExCmdParams *p); +void excmd_put(CmdContext *c, ExCmdParams *p); +void excmd_undo(CmdContext *c, ExCmdParams *p); +void excmd_redo(CmdContext *c, ExCmdParams *p); +void excmd_shift_left(CmdContext *c, ExCmdParams *p); +void excmd_shift_right(CmdContext *c, ExCmdParams *p); +void excmd_delete(CmdContext *c, ExCmdParams *p); +void excmd_join(CmdContext *c, ExCmdParams *p); #endif Modified: vimode/src/excmd-runner.c 22 lines changed, 21 insertions(+), 1 deletions(-) =================================================================== @@ -18,7 +18,7 @@ #include "excmd-runner.h" #include "excmd-params.h" -#include "excmds/excmds.h" +#include "cmds/excmds.h" #include "utils.h" #include <string.h> @@ -64,8 +64,28 @@ ExCmdDef ex_cmds[] = { {excmd_repeat_subst, "s"}, {excmd_repeat_subst, "substitute"}, {excmd_repeat_subst, "&"}, + {excmd_repeat_subst, "~"}, {excmd_repeat_subst_orig_flags, "&&"}, + {excmd_yank, "yank"}, + {excmd_yank, "y"}, + {excmd_put, "put"}, + {excmd_put, "pu"}, + + {excmd_undo, "undo"}, + {excmd_undo, "u"}, + {excmd_redo, "redo"}, + {excmd_redo, "red"}, + + {excmd_shift_left, "<"}, + {excmd_shift_right, ">"}, + + {excmd_delete, "delete"}, + {excmd_delete, "d"}, + + {excmd_join, "join"}, + {excmd_join, "j"}, + {NULL, NULL} }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f20a71: vimode: add :copy and :move ex commands
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 02 Sep 2021 15:23:17 UTC Commit: f20a71d0d063f8c064acfc5ad5de7074e0271b39 https://github.com/geany/geany-plugins/commit/f20a71d0d063f8c064acfc5ad5de7… Log Message: ----------- vimode: add :copy and :move ex commands Modified Paths: -------------- vimode/src/cmds/excmds.c vimode/src/cmds/excmds.h vimode/src/excmd-params.h vimode/src/excmd-runner.c Modified: vimode/src/cmds/excmds.c 28 lines changed, 28 insertions(+), 0 deletions(-) =================================================================== @@ -133,3 +133,31 @@ void excmd_join(CmdContext *c, ExCmdParams *p) cmd_join_lines(c, &params); } + +void excmd_copy(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + gint dest = SSM(c->sci, SCI_POSITIONFROMLINE, p->dest, 0); + excmd_yank(c, p); + SET_POS(c->sci, dest, TRUE); + cmd_params_init(&params, c->sci, 1, FALSE, NULL, FALSE, 0, 0); + cmd_paste_after(c, &params); +} + + +void excmd_move(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + gint dest; + + if (p->dest >= p->range_from && p->dest <= p->range_to) + return; + + excmd_delete(c, p); + if (p->dest > p->range_to) + p->dest -= p->range_to - p->range_from + 1; + dest = SSM(c->sci, SCI_POSITIONFROMLINE, p->dest, 0); + SET_POS(c->sci, dest, TRUE); + cmd_params_init(&params, c->sci, 1, FALSE, NULL, FALSE, 0, 0); + cmd_paste_after(c, &params); +} Modified: vimode/src/cmds/excmds.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -37,5 +37,7 @@ void excmd_shift_left(CmdContext *c, ExCmdParams *p); void excmd_shift_right(CmdContext *c, ExCmdParams *p); void excmd_delete(CmdContext *c, ExCmdParams *p); void excmd_join(CmdContext *c, ExCmdParams *p); +void excmd_copy(CmdContext *c, ExCmdParams *p); +void excmd_move(CmdContext *c, ExCmdParams *p); #endif Modified: vimode/src/excmd-params.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -30,6 +30,8 @@ typedef struct /* ex range start and end */ gint range_from; gint range_to; + /* "address" destination for copy/move */ + gint dest; } ExCmdParams; typedef void (*ExCmd)(CmdContext *c, ExCmdParams *p); Modified: vimode/src/excmd-runner.c 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -86,6 +86,13 @@ ExCmdDef ex_cmds[] = { {excmd_join, "join"}, {excmd_join, "j"}, + {excmd_copy, "copy"}, + {excmd_copy, "co"}, + {excmd_copy, "t"}, + + {excmd_move, "move"}, + {excmd_move, "m"}, + {NULL, NULL} }; @@ -433,7 +440,11 @@ static void perform_simple_ex_cmd(CmdContext *ctx, const gchar *cmd) ExCmdDef *def = &ex_cmds[i]; if (strcmp(def->name, cmd_name) == 0) { + if (def->cmd == excmd_copy || def->cmd == excmd_move) + parse_ex_range(&(params.param1), ctx, &(params.dest), &(params.dest)); + SSM(ctx->sci, SCI_BEGINUNDOACTION, 0, 0); def->cmd(ctx, &params); + SSM(ctx->sci, SCI_ENDUNDOACTION, 0, 0); break; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 935e5d: vimode: move excmds.c/h to cmds directory so we can include headers from there
by Jiří Techet 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 02 Sep 2021 15:23:17 UTC Commit: 935e5d080d72798251df09117ea5e894266d8e03 https://github.com/geany/geany-plugins/commit/935e5d080d72798251df09117ea5e… Log Message: ----------- vimode: move excmds.c/h to cmds directory so we can include headers from there Modified Paths: -------------- vimode/src/Makefile.am vimode/src/cmds/excmds.c vimode/src/cmds/excmds.h Modified: vimode/src/Makefile.am 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -36,8 +36,8 @@ vi_srcs = \ cmds/special.c \ cmds/edit.h \ cmds/edit.c \ - excmds/excmds.h \ - excmds/excmds.c + cmds/excmds.h \ + cmds/excmds.c vimode_la_SOURCES = \ backends/backend-geany.c \ Modified: vimode/src/cmds/excmds.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "excmds/excmds.h" +#include "cmds/excmds.h" #include "utils.h" void excmd_save(CmdContext *c, ExCmdParams *p) Modified: vimode/src/cmds/excmds.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __VIMODE_EXCMDS_EXCMDS_H__ -#define __VIMODE_EXCMDS_EXCMDS_H__ +#ifndef __VIMODE_CMDS_EXCMDS_H__ +#define __VIMODE_CMDS_EXCMDS_H__ #include "excmd-params.h" #include "context.h" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] b7eb47: Merge pull request #1105 from techee/vim_more_ex_commands
by Frank Lanitz 29 Sep '21

29 Sep '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 29 Sep 2021 17:10:37 UTC Commit: b7eb47d96a5e5e668db5060e88dec96085d3700b https://github.com/geany/geany-plugins/commit/b7eb47d96a5e5e668db5060e88dec… Log Message: ----------- Merge pull request #1105 from techee/vim_more_ex_commands vimode: add some more ex commands Modified Paths: -------------- vimode/README vimode/src/Makefile.am vimode/src/cmd-params.c vimode/src/cmds/excmds.c vimode/src/cmds/excmds.h vimode/src/excmd-params.h vimode/src/excmd-runner.c vimode/src/excmds/excmds.c Modified: vimode/README 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -550,16 +550,28 @@ a new command, please do not forget to update the table below.:: tag command action ------------------------------------------------------------------------------ :& :& repeat last ":substitute" + :< :< shift lines one 'shiftwidth' left + :> :> shift lines one 'shiftwidth' right + :copy :co[py] copy lines :cquit :cq[uit] quit Vim with an error code + :delete :d[elete] delete lines :exit :exi[t] same as ":xit" + :join :j[oin] join lines + :move :m[ove] move lines + :put :pu[t] insert contents of register in the text :quit :q[uit] quit current window (when one window quit Vim) :quitall :quita[ll] quit Vim :qall :qa[ll] quit Vim + :redo :red[o] redo one undone change :substitute :s[ubstitute] find and replace text + :t :t same as ":copy" + :undo :u[ndo] undo last change(s) :update :up[date] write buffer if modified :write :w[rite] write to a file :wall :wa[ll] write all (changed) buffers :wq :wq write to a file and quit window or Vim :wqall :wqa[ll] write all changed buffers and quit Vim :xit :x[it] write if buffer changed and quit window or Vim :xall :xa[ll] same as ":wqall" + :yank :y[ank] yank lines into a register + :~ :~ repeat last ":substitute" Modified: vimode/src/Makefile.am 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -36,8 +36,8 @@ vi_srcs = \ cmds/special.c \ cmds/edit.h \ cmds/edit.c \ - excmds/excmds.h \ - excmds/excmds.c + cmds/excmds.h \ + cmds/excmds.c vimode_la_SOURCES = \ backends/backend-geany.c \ Modified: vimode/src/cmd-params.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,7 @@ void cmd_params_init(CmdParams *param, ScintillaObject *sci, param->num = num; param->num_present = num_present; - param->last_kp = g_slist_nth_data(kpl, 0); + param->last_kp = kpl != NULL ? g_slist_nth_data(kpl, 0) : NULL; param->is_operator_cmd = is_operator_cmd; param->sel_start = sel_start; Modified: vimode/src/cmds/excmds.c 163 lines changed, 163 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,163 @@ +/* + * Copyright 2018 Jiri Techet <techet(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "cmds/excmds.h" +#include "cmds/edit.h" +#include "utils.h" + +void excmd_save(CmdContext *c, ExCmdParams *p) +{ + c->cb->on_save(p->force); +} + + +void excmd_save_all(CmdContext *c, ExCmdParams *p) +{ + c->cb->on_save_all(p->force); +} + + +void excmd_quit(CmdContext *c, ExCmdParams *p) +{ + c->cb->on_quit(p->force); +} + + +void excmd_save_quit(CmdContext *c, ExCmdParams *p) +{ + if (c->cb->on_save(p->force)) + c->cb->on_quit(p->force); +} + + +void excmd_save_all_quit(CmdContext *c, ExCmdParams *p) +{ + if (c->cb->on_save_all(p->force)) + c->cb->on_quit(p->force); +} + + +void excmd_repeat_subst(CmdContext *c, ExCmdParams *p) +{ + const gchar *flags = p->param1; + if (!flags) + flags = "g"; + perform_substitute(c->sci, c->substitute_text, p->range_from, p->range_to, flags); +} + + +void excmd_repeat_subst_orig_flags(CmdContext *c, ExCmdParams *p) +{ + perform_substitute(c->sci, c->substitute_text, p->range_from, p->range_to, NULL); +} + + +static void prepare_cmd_params(CmdParams *params, CmdContext *c, ExCmdParams *p) +{ + gint start = SSM(c->sci, SCI_POSITIONFROMLINE, p->range_from, 0); + SET_POS(c->sci, start, TRUE); + cmd_params_init(params, c->sci, p->range_to - p->range_from + 1, FALSE, NULL, FALSE, 0, 0); +} + + +void excmd_yank(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_copy_line(c, &params); +} + + +void excmd_put(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_paste_after(c, &params); +} + + +void excmd_undo(CmdContext *c, ExCmdParams *p) +{ + SSM(c->sci, SCI_UNDO, 0, 0); +} + + +void excmd_redo(CmdContext *c, ExCmdParams *p) +{ + SSM(c->sci, SCI_REDO, 0, 0); +} + + +void excmd_shift_left(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_unindent(c, &params); +} + + +void excmd_shift_right(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_indent(c, &params); +} + + +void excmd_delete(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_delete_line(c, &params); +} + +void excmd_join(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + prepare_cmd_params(&params, c, p); + cmd_join_lines(c, &params); +} + + +void excmd_copy(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + gint dest = SSM(c->sci, SCI_POSITIONFROMLINE, p->dest, 0); + excmd_yank(c, p); + SET_POS(c->sci, dest, TRUE); + cmd_params_init(&params, c->sci, 1, FALSE, NULL, FALSE, 0, 0); + cmd_paste_after(c, &params); +} + + +void excmd_move(CmdContext *c, ExCmdParams *p) +{ + CmdParams params; + gint dest; + + if (p->dest >= p->range_from && p->dest <= p->range_to) + return; + + excmd_delete(c, p); + if (p->dest > p->range_to) + p->dest -= p->range_to - p->range_from + 1; + dest = SSM(c->sci, SCI_POSITIONFROMLINE, p->dest, 0); + SET_POS(c->sci, dest, TRUE); + cmd_params_init(&params, c->sci, 1, FALSE, NULL, FALSE, 0, 0); + cmd_paste_after(c, &params); +} Modified: vimode/src/cmds/excmds.h 14 lines changed, 12 insertions(+), 2 deletions(-) =================================================================== @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __VIMODE_EXCMDS_EXCMDS_H__ -#define __VIMODE_EXCMDS_EXCMDS_H__ +#ifndef __VIMODE_CMDS_EXCMDS_H__ +#define __VIMODE_CMDS_EXCMDS_H__ #include "excmd-params.h" #include "context.h" @@ -29,5 +29,15 @@ void excmd_save_quit(CmdContext *c, ExCmdParams *p); void excmd_save_all_quit(CmdContext *c, ExCmdParams *p); void excmd_repeat_subst(CmdContext *c, ExCmdParams *p); void excmd_repeat_subst_orig_flags(CmdContext *c, ExCmdParams *p); +void excmd_yank(CmdContext *c, ExCmdParams *p); +void excmd_put(CmdContext *c, ExCmdParams *p); +void excmd_undo(CmdContext *c, ExCmdParams *p); +void excmd_redo(CmdContext *c, ExCmdParams *p); +void excmd_shift_left(CmdContext *c, ExCmdParams *p); +void excmd_shift_right(CmdContext *c, ExCmdParams *p); +void excmd_delete(CmdContext *c, ExCmdParams *p); +void excmd_join(CmdContext *c, ExCmdParams *p); +void excmd_copy(CmdContext *c, ExCmdParams *p); +void excmd_move(CmdContext *c, ExCmdParams *p); #endif Modified: vimode/src/excmd-params.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -30,6 +30,8 @@ typedef struct /* ex range start and end */ gint range_from; gint range_to; + /* "address" destination for copy/move */ + gint dest; } ExCmdParams; typedef void (*ExCmd)(CmdContext *c, ExCmdParams *p); Modified: vimode/src/excmd-runner.c 33 lines changed, 32 insertions(+), 1 deletions(-) =================================================================== @@ -18,7 +18,7 @@ #include "excmd-runner.h" #include "excmd-params.h" -#include "excmds/excmds.h" +#include "cmds/excmds.h" #include "utils.h" #include <string.h> @@ -64,8 +64,35 @@ ExCmdDef ex_cmds[] = { {excmd_repeat_subst, "s"}, {excmd_repeat_subst, "substitute"}, {excmd_repeat_subst, "&"}, + {excmd_repeat_subst, "~"}, {excmd_repeat_subst_orig_flags, "&&"}, + {excmd_yank, "yank"}, + {excmd_yank, "y"}, + {excmd_put, "put"}, + {excmd_put, "pu"}, + + {excmd_undo, "undo"}, + {excmd_undo, "u"}, + {excmd_redo, "redo"}, + {excmd_redo, "red"}, + + {excmd_shift_left, "<"}, + {excmd_shift_right, ">"}, + + {excmd_delete, "delete"}, + {excmd_delete, "d"}, + + {excmd_join, "join"}, + {excmd_join, "j"}, + + {excmd_copy, "copy"}, + {excmd_copy, "co"}, + {excmd_copy, "t"}, + + {excmd_move, "move"}, + {excmd_move, "m"}, + {NULL, NULL} }; @@ -413,7 +440,11 @@ static void perform_simple_ex_cmd(CmdContext *ctx, const gchar *cmd) ExCmdDef *def = &ex_cmds[i]; if (strcmp(def->name, cmd_name) == 0) { + if (def->cmd == excmd_copy || def->cmd == excmd_move) + parse_ex_range(&(params.param1), ctx, &(params.dest), &(params.dest)); + SSM(ctx->sci, SCI_BEGINUNDOACTION, 0, 0); def->cmd(ctx, &params); + SSM(ctx->sci, SCI_ENDUNDOACTION, 0, 0); break; } } Modified: vimode/src/excmds/excmds.c 66 lines changed, 0 insertions(+), 66 deletions(-) =================================================================== @@ -1,66 +0,0 @@ -/* - * Copyright 2018 Jiri Techet <techet(a)gmail.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "excmds/excmds.h" -#include "utils.h" - -void excmd_save(CmdContext *c, ExCmdParams *p) -{ - c->cb->on_save(p->force); -} - - -void excmd_save_all(CmdContext *c, ExCmdParams *p) -{ - c->cb->on_save_all(p->force); -} - - -void excmd_quit(CmdContext *c, ExCmdParams *p) -{ - c->cb->on_quit(p->force); -} - - -void excmd_save_quit(CmdContext *c, ExCmdParams *p) -{ - if (c->cb->on_save(p->force)) - c->cb->on_quit(p->force); -} - - -void excmd_save_all_quit(CmdContext *c, ExCmdParams *p) -{ - if (c->cb->on_save_all(p->force)) - c->cb->on_quit(p->force); -} - - -void excmd_repeat_subst(CmdContext *c, ExCmdParams *p) -{ - const gchar *flags = p->param1; - if (!flags) - flags = "g"; - perform_substitute(c->sci, c->substitute_text, p->range_from, p->range_to, flags); -} - - -void excmd_repeat_subst_orig_flags(CmdContext *c, ExCmdParams *p) -{ - perform_substitute(c->sci, c->substitute_text, p->range_from, p->range_to, NULL); -} -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d90968: SpellCheck: Add notes about maintaining personal dictionaries
by Enrico Tröger 19 Sep '21

19 Sep '21

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 04 Sep 2021 12:00:39 UTC Commit: d90968fc14a3aa6fb197faa9f3bc97c6f66e28ad https://github.com/geany/geany-plugins/commit/d90968fc14a3aa6fb197faa9f3bc9… Log Message: ----------- SpellCheck: Add notes about maintaining personal dictionaries Modified Paths: -------------- spellcheck/README Modified: spellcheck/README 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -83,6 +83,24 @@ Then in the plugin configuration dialog set the dictionary for dictionary files to: `C:\\dictionaries`. +Maintaining personal dictionaries +--------------------------------- +When you manually add words to your personal dictionary +(using the "Add <word> to Dictionary" menu item), those words are stored +in a personal dictionary per language. +If you want to add, modify or remove words from these dictionaries, +you need to open the dictionaries with an editor like Geany and edit them. +As far as we know, there is no graphical tool to edit those files. However, +they are plain text files with one word per line. + +These files are usually located in: +`/home/<username>/.config/enchant/<LANG>.dic`. +The exact storage location might differ between operating systems. + +Additional informationcan be found on https://github.com/AbiWord/enchant, +section "Sharing personal word lists between spell-checkers". + + Known issues ------------ * Spell checking with some languages like Hindi might be incorrect, i.e. some -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 002938: Merge pull request #1108 from eht16/spellcheck_add_personal_dict_docs
by Frank Lanitz 19 Sep '21

19 Sep '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 19 Sep 2021 14:06:24 UTC Commit: 002938a6706bb2c43ddcf55bfbe496896271d671 https://github.com/geany/geany-plugins/commit/002938a6706bb2c43ddcf55bfbe49… Log Message: ----------- Merge pull request #1108 from eht16/spellcheck_add_personal_dict_docs SpellCheck: Add notes about maintaining personal dictionaries Modified Paths: -------------- spellcheck/README Modified: spellcheck/README 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -83,6 +83,24 @@ Then in the plugin configuration dialog set the dictionary for dictionary files to: `C:\\dictionaries`. +Maintaining personal dictionaries +--------------------------------- +When you manually add words to your personal dictionary +(using the "Add <word> to Dictionary" menu item), those words are stored +in a personal dictionary per language. +If you want to add, modify or remove words from these dictionaries, +you need to open the dictionaries with an editor like Geany and edit them. +As far as we know, there is no graphical tool to edit those files. However, +they are plain text files with one word per line. + +These files are usually located in: +`/home/<username>/.config/enchant/<LANG>.dic`. +The exact storage location might differ between operating systems. + +Additional informationcan be found on https://github.com/AbiWord/enchant, +section "Sharing personal word lists between spell-checkers". + + Known issues ------------ * Spell checking with some languages like Hindi might be incorrect, i.e. some -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 57bc7f: Replace Sourceforge references
by Enrico Tröger 19 Sep '21

19 Sep '21

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 27 Jun 2021 21:09:48 UTC Commit: 57bc7fd62a0fd910b3e11971a9ff98ab106a1b00 https://github.com/geany/geany-plugins/commit/57bc7fd62a0fd910b3e11971a9ff9… Log Message: ----------- Replace Sourceforge references Modified Paths: -------------- geanyprj/README latex/doc/latex.html Modified: geanyprj/README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -71,7 +71,7 @@ Example of usage Lets see plugin work at Geany source code example: -1) Download geany-0.15.tar.gz (http://prdownloads.sourceforge.net/geany/geany-0.15.tar.gz?download) +1) Download geany-0.15.tar.gz (https://download.geany.org/old/geany-0.15.tar.gz) 2) Unpack it somewhere, for example in ~/src/geany-0.15 Modified: latex/doc/latex.html 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -2724,8 +2724,8 @@ <h5 class="subsubsectionHead">wished features and which are being worked on. Also you can have a look onto the feature request tracker of geany-plugins project at <a -href="https://sourceforge.net/projects/geany-plugins/" class="url" >https://sourceforge.net/projects/geany-plugins/</a> https://github.com/geany/geany-plugins/</a> whether you find something interesting. Of course we are also open for not in the sources mentioned before listed items. Just contact one of the @@ -2920,8 +2920,8 @@ <h3 class="sectionHead">recent information for all reported issues bug tracking system of SF at <a -href="https://sourceforge.net/projects/geany-plugins/" class="url" >https://sourceforge.net/projects/geany-plugins/</a> +href="https://github.com/geany/geany-plugins/" class="url" >https://github.com/geany/geany-plugins/</a>  <h3 class="sectionHead"><span -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 62d155: Merge pull request #1087 from eht16/remove_sourceforge_references
by Frank Lanitz 19 Sep '21

19 Sep '21

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 19 Sep 2021 13:49:48 UTC Commit: 62d155b2a46766d55a5e3be56eb1affeea5c454e https://github.com/geany/geany-plugins/commit/62d155b2a46766d55a5e3be56eb1a… Log Message: ----------- Merge pull request #1087 from eht16/remove_sourceforge_references Replace Sourceforge references Modified Paths: -------------- geanyprj/README latex/doc/latex.html Modified: geanyprj/README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -71,7 +71,7 @@ Example of usage Lets see plugin work at Geany source code example: -1) Download geany-0.15.tar.gz (http://prdownloads.sourceforge.net/geany/geany-0.15.tar.gz?download) +1) Download geany-0.15.tar.gz (https://download.geany.org/old/geany-0.15.tar.gz) 2) Unpack it somewhere, for example in ~/src/geany-0.15 Modified: latex/doc/latex.html 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -2724,8 +2724,8 @@ <h5 class="subsubsectionHead">wished features and which are being worked on. Also you can have a look onto the feature request tracker of geany-plugins project at <a -href="https://sourceforge.net/projects/geany-plugins/" class="url" >https://sourceforge.net/projects/geany-plugins/</a> https://github.com/geany/geany-plugins/</a> whether you find something interesting. Of course we are also open for not in the sources mentioned before listed items. Just contact one of the @@ -2920,8 +2920,8 @@ <h3 class="sectionHead">recent information for all reported issues bug tracking system of SF at <a -href="https://sourceforge.net/projects/geany-plugins/" class="url" >https://sourceforge.net/projects/geany-plugins/</a> +href="https://github.com/geany/geany-plugins/" class="url" >https://github.com/geany/geany-plugins/</a>  <h3 class="sectionHead"><span -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits September 2021