From f06be0ffcf2c134d0fe12ce7e83d8697923a5712 Mon Sep 17 00:00:00 2001 From: m0viefreak Date: Sun, 10 Apr 2016 14:57:51 +0200 Subject: 38291: Change names of ISEARCH_* parameters to ISEARCHMATCH_* --- ChangeLog | 5 +++++ Doc/Zsh/zle.yo | 20 ++++++++++---------- Src/Zle/zle_params.c | 24 ++++++++++++------------ 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8bfad8c8..0710a0d82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-04-23 m0viefreak + + * 38291: Doc/Zsh/zle.yo, Src/Zle/zle_params.c: Change names of + ISEARCH_* parameters to ISEARCHMATCH_* + 2016-04-23 Barton E. Schaefer * Mikael Berthe: 38307: Src/Modules/pcre.c: PCRE segfault when diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo index c482a4691..80d3f39d8 100644 --- a/Doc/Zsh/zle.yo +++ b/Doc/Zsh/zle.yo @@ -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. ) diff --git a/Src/Zle/zle_params.c b/Src/Zle/zle_params.c index 7cbb3df5a..c6387bfc7 100644 --- a/Src/Zle/zle_params.c +++ b/Src/Zle/zle_params.c @@ -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; } -- cgit 1.4.1