diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2011-08-17 10:15:49 +0000 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2011-08-17 10:15:49 +0000 |
| commit | cd3acd762de380d84c0e1f213f4b9bcc36206d55 (patch) | |
| tree | cbc7f8c8d355a699d18bd2711af83943313ff6ab | |
| parent | 2c9b4e769fbf04c402f2ac01752e52d81e51932e (diff) | |
| download | zsh-cd3acd762de380d84c0e1f213f4b9bcc36206d55.tar.gz zsh-cd3acd762de380d84c0e1f213f4b9bcc36206d55.tar.xz zsh-cd3acd762de380d84c0e1f213f4b9bcc36206d55.zip | |
29681: use [] to dereference region_highlights
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/Zle/zle_refresh.c | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 208b3f6a1..3427e05f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-08-17 Mikael Magnusson <mikachu@gmail.com> + + * 29681: Src/Zle/zle_refresh.c: consistently use [] to access + region_highlights. + 2011-08-16 Wayne Davison <wayned@users.sourceforge.net> * 29650: Src/jobs.c: don't lose the the time info after a @@ -15270,5 +15275,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5431 $ +* $Revision: 1.5432 $ ***************************************************** diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c index 52797831c..260df8bf6 100644 --- a/Src/Zle/zle_refresh.c +++ b/Src/Zle/zle_refresh.c @@ -341,7 +341,7 @@ zle_set_highlight(void) match_highlight(*atrs + 8, &special_atr_on); special_atr_on_set = 1; } else if (strpfx("region:", *atrs)) { - match_highlight(*atrs + 7, ®ion_highlights->atr); + match_highlight(*atrs + 7, ®ion_highlights[0].atr); region_atr_on_set = 1; } else if (strpfx("isearch:", *atrs)) { match_highlight(*atrs + 8, &(region_highlights[1].atr)); @@ -357,7 +357,7 @@ zle_set_highlight(void) if (!special_atr_on_set) special_atr_on = TXTSTANDOUT; if (!region_atr_on_set) - region_highlights->atr = TXTSTANDOUT; + region_highlights[0].atr = TXTSTANDOUT; if (!isearch_atr_on_set) region_highlights[1].atr = TXTUNDERLINE; if (!suffix_atr_on_set) @@ -1022,14 +1022,14 @@ zrefresh(void) /* check for region between point ($CURSOR) and mark ($MARK) */ if (region_active) { if (zlecs <= mark) { - region_highlights->start = zlecs; - region_highlights->end = mark; + region_highlights[0].start = zlecs; + region_highlights[0].end = mark; } else { - region_highlights->start = mark; - region_highlights->end = zlecs; + region_highlights[0].start = mark; + region_highlights[0].end = zlecs; } } else { - region_highlights->start = region_highlights->end = -1; + region_highlights[0].start = region_highlights[0].end = -1; } /* check for isearch string to highlight */ if (isearch_active) { |