mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-07-31 23:31:03 +02:00
Code Releases Activity

38291: Change names of ISEARCH_* parameters to ISEARCHMATCH_*

Browse source
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

5
ChangeLog
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> 2016-04-23 Barton E. Schaefer <schaefer@zsh.org>
* Mikael Berthe: 38307: Src/Modules/pcre.c: PCRE segfault when * Mikael Berthe: 38307: Src/Modules/pcre.c: PCRE segfault when

20
Doc/Zsh/zle.yo
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 shell's history. tt(HISTNO) refers to the line being retrieved within
zle. zle.
) )
vindex(ISEARCH_ACTIVE) vindex(ISEARCHMATCH_ACTIVE)
vindex(ISEARCH_START) vindex(ISEARCHMATCH_START)
vindex(ISEARCH_END) vindex(ISEARCHMATCH_END)
xitem(tt(ISEARCH_ACTIVE) (integer)) xitem(tt(ISEARCHMATCH_ACTIVE) (integer))
xitem(tt(ISEARCH_START) (integer)) xitem(tt(ISEARCHMATCH_START) (integer))
item(tt(ISEARCH_END) (integer))( item(tt(ISEARCHMATCH_END) (integer))(
tt(ISEARCH_ACTIVE) indicates whether a part of the tt(BUFFER) is tt(ISEARCHMATCH_ACTIVE) indicates whether a part of the tt(BUFFER) is
currently matched by an incremental search pattern. tt(ISEARCH_START) currently matched by an incremental search pattern. tt(ISEARCHMATCH_START)
and tt(ISEARCH_END) give the location of the matched part and are 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 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. All parameters are read-only.
) )

24
Src/Zle/zle_params.c
View file

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