stonewareslord/zsh-syntax-highlighting
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: stonewareslord:master
Branches Tags
stonewareslord:master
stonewareslord:feature/redrawhook
stonewareslord:i652-v1
stonewareslord:themes
stonewareslord:0.5.x
stonewareslord:0.4.x
stonewareslord:0.7.1
stonewareslord:0.7.0
stonewareslord:0.7.0-beta1
stonewareslord:0.6.0
stonewareslord:0.6.0-rc1
stonewareslord:0.5.0
stonewareslord:0.4.1
stonewareslord:0.4.0
stonewareslord:0.3.0
stonewareslord:0.2.1
stonewareslord:0.2.0
stonewareslord:0.1.3
stonewareslord:0.1.2
stonewareslord:0.1.1
stonewareslord:0.1.0
...
pull from: stonewareslord:0.5.x
Branches Tags
stonewareslord:master
stonewareslord:feature/redrawhook
stonewareslord:i652-v1
stonewareslord:themes
stonewareslord:0.5.x
stonewareslord:0.4.x
stonewareslord:0.7.1
stonewareslord:0.7.0
stonewareslord:0.7.0-beta1
stonewareslord:0.6.0
stonewareslord:0.6.0-rc1
stonewareslord:0.5.0
stonewareslord:0.4.1
stonewareslord:0.4.0
stonewareslord:0.3.0
stonewareslord:0.2.1
stonewareslord:0.2.0
stonewareslord:0.1.3
stonewareslord:0.1.2
stonewareslord:0.1.1
stonewareslord:0.1.0

9 Commits
master ... 0.5.x

Author SHA1 Message Date
Daniel Shahaf
eb67c0b84f Post-release version number bump. 2016-10-24 11:32:54 +00:00
Daniel Shahaf
15d4587514 Tag version 0.5.0. 2016-10-24 11:32:54 +00:00
Daniel Shahaf
e5a59f6b56 changelog: Update for post-branch changes. 2016-10-24 11:32:54 +00:00
Daniel Shahaf
b4d882dd59 Merge remote-tracking branch 'upstream/master' into 0.5.x 
* upstream/master:
  Follow-up to 28d7056a7a: Fix test expectations.
 2016-10-22 19:46:46 +00:00
Daniel Shahaf
2e95ffc08f Merge remote-tracking branch 'upstream/master' into 0.5.x 
* upstream/master:
  README: Set alt="" attributes.
  README: Add a third image.
  README: Add another image.
  README: Use a more minimal example iamge.
  README: Add before/after images
  changelog: Update through 28d7056a7a.
  'main': Escape '!' within double-quoted strings.
  [REVERTED] Post-branch version number bump.
    This reverts commit 1bdb88aee1.
 2016-10-22 17:43:05 +00:00
Daniel Shahaf
5dcf0cecd8 driver: Revert changes that depend on not-yet-released zsh features. 
The $ISEARCHMATCH_ACTIVE and $SUFFIX_ACTIVE have not yet appeared in a zsh release.
 2016-10-19 23:03:44 +00:00
Daniel Shahaf
31250c77bf Revert "apply suffix and isearch zle_highlights on top" 
This reverts commit 79e4d3d124.
 2016-10-19 23:03:19 +00:00
Daniel Shahaf
39ab1b7321 Revert "driver: Track rename of an unreleased upstream API." 
This reverts commit 15db71abd0.
 2016-10-19 23:03:19 +00:00
Daniel Shahaf
af0099465f Revert "driver: Enable highlighting during isearch under zsh≥5.3." 
This reverts commit 4ad311ec0a.
 2016-10-19 23:03:16 +00:00
3 changed files with 3 additions and 14 deletions
Show Stats Expand all files Collapse all files

2
.version
View File

@ -1 +1 @@
0.6.0-dev 0.5.1-dev

7
changelog.md
View File

@ -1,4 +1,4 @@
up to 28d7056a7a06 up to 0.5.0
# Changes in version 0.5.0 # Changes in version 0.5.0
@ -27,11 +27,6 @@ in this area.
- Aliases that cannot be defined normally nor invoked normally (highlighted as an error). - Aliases that cannot be defined normally nor invoked normally (highlighted as an error).
(#263 (in part), 28932316cca6) (#263 (in part), 28932316cca6)
- The `isearch` and `suffix` [`$zle_highlight` settings][zshzle-Character-Highlighting].
(79e4d3d12405, 15db71abd0cc; requires zsh 5.3 for `$ISEARCHMATCH_ACTIVE` / `$SUFFIX_ACTIVE` support)
[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
- Path separators (`/`) — the default behaviour remains to highlight path separators - Path separators (`/`) — the default behaviour remains to highlight path separators
and path components the same way. and path components the same way.
(#136, #260, 6cd39e7c70d3, 9a934d291e7c, f3d3aaa00cc4) (#136, #260, 6cd39e7c70d3, 9a934d291e7c, f3d3aaa00cc4)

8
zsh-syntax-highlighting.zsh
View File

@ -60,7 +60,7 @@ _zsh_highlight()
# Remove all highlighting in isearch, so that only the underlining done by zsh itself remains. # Remove all highlighting in isearch, so that only the underlining done by zsh itself remains.
# For details see FAQ entry 'Why does syntax highlighting not work while searching history?'. # For details see FAQ entry 'Why does syntax highlighting not work while searching history?'.
if [[ $WIDGET == zle-isearch-update ]] && ! (( $+ISEARCHMATCH_ACTIVE )); then if [[ $WIDGET == zle-isearch-update ]]; then
region_highlight=() region_highlight=()
return $ret return $ret
fi fi
@ -142,12 +142,6 @@ _zsh_highlight()
# yank / paste (zsh-5.1.1 and newer) # yank / paste (zsh-5.1.1 and newer)
(( $+YANK_ACTIVE )) && (( YANK_ACTIVE )) && _zsh_highlight_apply_zle_highlight paste standout "$YANK_START" "$YANK_END" (( $+YANK_ACTIVE )) && (( YANK_ACTIVE )) && _zsh_highlight_apply_zle_highlight paste standout "$YANK_START" "$YANK_END"
# isearch
(( $+ISEARCHMATCH_ACTIVE )) && (( ISEARCHMATCH_ACTIVE )) && _zsh_highlight_apply_zle_highlight isearch underline "$ISEARCHMATCH_START" "$ISEARCHMATCH_END"
# suffix
(( $+SUFFIX_ACTIVE )) && (( SUFFIX_ACTIVE )) && _zsh_highlight_apply_zle_highlight suffix bold "$SUFFIX_START" "$SUFFIX_END"
return $ret return $ret