1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-07-26 21:51:03 +02:00

38291: Change names of ISEARCH_* parameters to ISEARCHMATCH_*

This commit is contained in:
m0viefreak 2016-04-10 14:57:51 +02:00 committed by Daniel Shahaf
parent 222dea055c
commit f06be0ffcf
3 changed files with 27 additions and 22 deletions

View file

@ -1,3 +1,8 @@
2016-04-23 m0viefreak <m0viefreak.cm@googlemail.com>
* 38291: Doc/Zsh/zle.yo, Src/Zle/zle_params.c: Change names of
ISEARCH_* parameters to ISEARCHMATCH_*
2016-04-23 Barton E. Schaefer <schaefer@zsh.org>
* Mikael Berthe: 38307: Src/Modules/pcre.c: PCRE segfault when

View file

@ -835,17 +835,17 @@ which always gives the number of the history line being added to the main
shell's history. tt(HISTNO) refers to the line being retrieved within
zle.
)
vindex(ISEARCH_ACTIVE)
vindex(ISEARCH_START)
vindex(ISEARCH_END)
xitem(tt(ISEARCH_ACTIVE) (integer))
xitem(tt(ISEARCH_START) (integer))
item(tt(ISEARCH_END) (integer))(
tt(ISEARCH_ACTIVE) indicates whether a part of the tt(BUFFER) is
currently matched by an incremental search pattern. tt(ISEARCH_START)
and tt(ISEARCH_END) give the location of the matched part and are
vindex(ISEARCHMATCH_ACTIVE)
vindex(ISEARCHMATCH_START)
vindex(ISEARCHMATCH_END)
xitem(tt(ISEARCHMATCH_ACTIVE) (integer))
xitem(tt(ISEARCHMATCH_START) (integer))
item(tt(ISEARCHMATCH_END) (integer))(
tt(ISEARCHMATCH_ACTIVE) indicates whether a part of the tt(BUFFER) is
currently matched by an incremental search pattern. tt(ISEARCHMATCH_START)
and tt(ISEARCHMATCH_END) give the location of the matched part and are
in the same units as tt(CURSOR). They are only valid for reading
when tt(ISEARCH_ACTIVE) is non-zero.
when tt(ISEARCHMATCH_ACTIVE) is non-zero.
All parameters are read-only.
)

View file

@ -103,12 +103,12 @@ static const struct gsu_integer yankend_gsu =
{ get_yankend, set_yankend, zleunsetfn };
static const struct gsu_integer yankactive_gsu =
{ get_yankactive, NULL, zleunsetfn };
static const struct gsu_integer isearchstart_gsu =
{ get_isearchstart, NULL, zleunsetfn };
static const struct gsu_integer isearchend_gsu =
{ get_isearchend, NULL, zleunsetfn };
static const struct gsu_integer isearchactive_gsu =
{ get_isearchactive, NULL, zleunsetfn };
static const struct gsu_integer isearchmatchstart_gsu =
{ get_isearchmatchstart, NULL, zleunsetfn };
static const struct gsu_integer isearchmatchend_gsu =
{ get_isearchmatchend, NULL, zleunsetfn };
static const struct gsu_integer isearchmatchactive_gsu =
{ get_isearchmatchactive, NULL, zleunsetfn };
static const struct gsu_integer suffixstart_gsu =
{ get_suffixstart, NULL, zleunsetfn };
static const struct gsu_integer suffixend_gsu =
@ -164,9 +164,9 @@ static struct zleparam {
{ "YANK_START", PM_INTEGER, GSU(yankstart_gsu), NULL },
{ "YANK_END", PM_INTEGER, GSU(yankend_gsu), NULL },
{ "YANK_ACTIVE", PM_INTEGER | PM_READONLY, GSU(yankactive_gsu), NULL },
{ "ISEARCH_START", PM_INTEGER, GSU(isearchstart_gsu), NULL },
{ "ISEARCH_END", PM_INTEGER, GSU(isearchend_gsu), NULL },
{ "ISEARCH_ACTIVE", PM_INTEGER | PM_READONLY, GSU(isearchactive_gsu), NULL },
{ "ISEARCHMATCH_START", PM_INTEGER, GSU(isearchmatchstart_gsu), NULL },
{ "ISEARCHMATCH_END", PM_INTEGER, GSU(isearchmatchend_gsu), NULL },
{ "ISEARCHMATCH_ACTIVE", PM_INTEGER | PM_READONLY, GSU(isearchmatchactive_gsu), NULL },
{ "SUFFIX_START", PM_INTEGER, GSU(suffixstart_gsu), NULL },
{ "SUFFIX_END", PM_INTEGER, GSU(suffixend_gsu), NULL },
{ "SUFFIX_ACTIVE", PM_INTEGER | PM_READONLY, GSU(suffixactive_gsu), NULL },
@ -540,21 +540,21 @@ set_yankend(UNUSED(Param pm), zlong i)
/**/
static zlong
get_isearchstart(UNUSED(Param pm))
get_isearchmatchstart(UNUSED(Param pm))
{
return isearch_startpos;
}
/**/
static zlong
get_isearchend(UNUSED(Param pm))
get_isearchmatchend(UNUSED(Param pm))
{
return isearch_endpos;
}
/**/
static zlong
get_isearchactive(UNUSED(Param pm))
get_isearchmatchactive(UNUSED(Param pm))
{
return isearch_active;
}