vis

a vi-like editor based on Plan 9's structural regular expressions

git clone https://9o.is/git/vis.git

commit aacac1998dca63ac9b98bcebcc2b5704a53e5e96
parent 92027b48eab93a7dca633bfc52b1d5326242411a
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Sat, 12 Mar 2016 13:52:36 +0100

register: rename register put related functions

Diffstat:
Mregister.c | 6+++---
Mregister.h | 4++--
Mvis-operators.c | 6+++---
3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/register.c b/register.c @@ -58,9 +58,9 @@ const char *register_get(Vis *vis, Register *reg, size_t *len) { } } -bool register_put(Vis *vis, Register *reg, Text *txt, Filerange *range) { +bool register_put_range(Vis *vis, Register *reg, Text *txt, Filerange *range) { if (reg->append) - return register_append(reg, txt, range); + return register_append_range(reg, txt, range); switch (reg->type) { case REGISTER_NORMAL: { @@ -93,7 +93,7 @@ bool register_put(Vis *vis, Register *reg, Text *txt, Filerange *range) { } } -bool register_append(Register *reg, Text *txt, Filerange *range) { +bool register_append_range(Register *reg, Text *txt, Filerange *range) { switch (reg->type) { case REGISTER_NORMAL: { diff --git a/register.h b/register.h @@ -23,7 +23,7 @@ typedef struct { void register_release(Register *reg); const char *register_get(Vis*, Register*reg, size_t *len); -bool register_put(Vis*, Register *reg, Text *txt, Filerange *range); -bool register_append(Register *reg, Text *txt, Filerange *range); +bool register_put_range(Vis*, Register *reg, Text *txt, Filerange *range); +bool register_append_range(Register *reg, Text *txt, Filerange *range); #endif diff --git a/vis-operators.c b/vis-operators.c @@ -8,7 +8,7 @@ static size_t op_delete(Vis *vis, Text *txt, OperatorContext *c) { c->reg->linewise = c->linewise; - register_put(vis, c->reg, txt, &c->range); + register_put_range(vis, c->reg, txt, &c->range); text_delete_range(txt, &c->range); size_t pos = c->range.start; if (c->linewise && pos == text_size(txt)) @@ -24,9 +24,9 @@ static size_t op_change(Vis *vis, Text *txt, OperatorContext *c) { static size_t op_yank(Vis *vis, Text *txt, OperatorContext *c) { c->reg->linewise = c->linewise; - register_put(vis, c->reg, txt, &c->range); + register_put_range(vis, c->reg, txt, &c->range); if (c->reg == &vis->registers[VIS_REG_DEFAULT]) - register_put(vis, &vis->registers[VIS_REG_ZERO], txt, &c->range); + register_put_range(vis, &vis->registers[VIS_REG_ZERO], txt, &c->range); return c->linewise ? c->pos : c->range.start; }