Skip to content

Commit 0ddb1a8

Browse files
committed
driver: Bump the in-development is-at-least checks so they return false on zsh 5.8.1, released yesterday.
Fixes #856 Fixes #857
1 parent c10808a commit 0ddb1a8

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Release procedure (for developers):
22

3+
- Ensure every `is-at-least` invocation passes a stable zsh release's version number as the first argument
34
- For minor (A.B.0) releases:
45
- Check whether the release uses any not-yet-released zsh features
56
- Check open issues and outstanding pull requests

zsh-syntax-highlighting.zsh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,15 @@ _zsh_highlight()
158158
#
159159
# The memo= feature was added to zsh in commit zsh-5.8-172-gdd6e702ee.
160160
# The version number at the time was 5.8.0.2-dev (see Config/version.mk).
161-
# Therefore, on 5.8.0.3 and newer the memo= feature is available.
161+
# Therefore, on zsh master 5.8.0.3 and newer the memo= feature is available.
162+
# However, there's also the zsh 5.8.1 release, which doesn't have the
163+
# memo= feature.
162164
#
163-
# On zsh version 5.8.0.2 between the aforementioned commit and the
164-
# first Config/version.mk bump after it (which, at the time of writing,
165-
# is yet to come), this condition will false negative.
166-
if is-at-least 5.8.0.3 $ZSH_VERSION.0.0; then
165+
# On zsh master 5.8.0.2 between the aforementioned commit and the
166+
# first Config/version.mk bump after it (zsh-5.8-607-g75c1edde5, the
167+
# bump to 5.8.1.1-dev following the backport to master of the bump
168+
# to 5.8.1), this condition will false negative.
169+
if is-at-least 5.8.1.1 $ZSH_VERSION.0.0; then
167170
integer -gr zsh_highlight__memo_feature=1
168171
else
169172
integer -gr zsh_highlight__memo_feature=0
@@ -413,9 +416,8 @@ _zsh_highlight_call_widget()
413416
# as done by _zsh_highlight, can only be done from inside a widget
414417
# function — a catch-22.
415418
#
416-
# See _zsh_highlight for the magic version number. (The use of 5.8.0.2
417-
# rather than 5.8.0.3 as in the _zsh_highlight is deliberate.)
418-
if is-at-least 5.8.0.2 $ZSH_VERSION.0.0 && _zsh_highlight__function_callable_p add-zle-hook-widget
419+
# See _zsh_highlight for the magic version number.
420+
if is-at-least 5.8.1.1 $ZSH_VERSION.0.0 && _zsh_highlight__function_callable_p add-zle-hook-widget
419421
then
420422
autoload -U add-zle-hook-widget
421423
_zsh_highlight__zle-line-finish() {

0 commit comments

Comments
 (0)