xinb
/
zsh-syntax-highlighting
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: xinb:3b9103c8213598d902e5ce34f49e5d85f1c22f66
Branches Tags
xinb:master
xinb:feature/redrawhook
xinb:i652-v1
xinb:themes
xinb:0.5.x
xinb:0.4.x
xinb:0.8.0
xinb:0.8.0-alpha1-pre-redrawhook
xinb:0.7.1
xinb:0.7.0
xinb:0.7.0-beta1
xinb:0.6.0
xinb:0.6.0-rc1
xinb:0.5.0
xinb:0.4.1
xinb:0.4.0
xinb:0.3.0
xinb:0.2.1
xinb:0.2.0
xinb:0.1.3
xinb:0.1.2
xinb:0.1.1
xinb:0.1.0
...
compare: xinb:050a8ef6895a44cbcaf9969546b2c62ae545bcb5
Branches Tags
xinb:master
xinb:feature/redrawhook
xinb:i652-v1
xinb:themes
xinb:0.5.x
xinb:0.4.x
xinb:0.8.0
xinb:0.8.0-alpha1-pre-redrawhook
xinb:0.7.1
xinb:0.7.0
xinb:0.7.0-beta1
xinb:0.6.0
xinb:0.6.0-rc1
xinb:0.5.0
xinb:0.4.1
xinb:0.4.0
xinb:0.3.0
xinb:0.2.1
xinb:0.2.0
xinb:0.1.3
xinb:0.1.2
xinb:0.1.1
xinb:0.1.0

3 Commits
3b9103c821 ... 050a8ef689

Author SHA1 Message Date
m0vie 050a8ef689
Merge d91164af4f into 1d85c69261 2026-02-10 21:33:38 +05:30
Matthew Martin 1d85c69261 main: precommand_options += caffeinate 
Closes #975
 2026-02-08 10:49:40 -06:00
m0viefreak d91164af4f tests: Set ZSH explicitly make sure PATH is exported 
'env -i' clears the complete environment, including PATH. In that
case, on most platforms, when excuting commands without PATH being
set, /usr/bin and /bin are searched, e.g. on Linux:

  $ strace env -i asdf |&  grep asdf
  execve("/usr/bin/env", ["env", "-i", "asdf"], 0x7ffc3e3c0890 /* 27 vars */) = 0
  execve("/bin/asdf", ["asdf"], 0x55be2da090d0 /* 0 vars */) = -1 ENOENT (No such file or directory)
  execve("/usr/bin/asdf", ["asdf"], 0x55be2da090d0 /* 0 vars */) = -1 ENOENT (No such file or directory)
  write(2, "\342\200\230asdf\342\200\231", 10‘asdf’) = 10

Howver, this does not hold on every platform. E.g. on Cygwin, so
such fallback paths are searched:

  $ strace env -i asdf |&  grep asdf
     37   25736 [main] env 3516 build_argv: argv[2] = 'asdf'
    643   30373 [main] env 3516 find_exec: find_exec (asdf)
     35   30408 [main] env 3516 find_exec: (null) = find_exec (asdf)
     36   30444 [main] env 3516 spawnve: spawnve (, asdf, 0x10040B000)
  ‘asdf’  199   53601 [main] env 3516 write: 10 = write(2, 0x10040B040, 10)

  $ env -i zsh
  env: ‘zsh’: No such file or directory

Therefore, we need to make sure that the default PATH is exported
from tests/test-highlighting.zsh.
 2020-08-15 13:36:22 +02:00
3 changed files with 3 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
Makefile
View File

@ -4,7 +4,7 @@ INSTALL?=install -c
PREFIX?=/usr/local PREFIX?=/usr/local
SHARE_DIR?=$(DESTDIR)$(PREFIX)/share/$(NAME) SHARE_DIR?=$(DESTDIR)$(PREFIX)/share/$(NAME)
DOC_DIR?=$(DESTDIR)$(PREFIX)/share/doc/$(NAME) DOC_DIR?=$(DESTDIR)$(PREFIX)/share/doc/$(NAME)
ZSH?=zsh # zsh binary to run tests with ZSH?="`which zsh`" # zsh binary to run tests with
all: all:
cd docs && \ cd docs && \

1
highlighters/main/main-highlighter.zsh
View File

@ -372,6 +372,7 @@ _zsh_highlight_highlighter_main_paint()
'grc' :se # grc - a "generic colouriser" (that's their spelling, not mine) 'grc' :se # grc - a "generic colouriser" (that's their spelling, not mine)
'cpulimit' elp:ivz # cpulimit 0.2 'cpulimit' elp:ivz # cpulimit 0.2
'ktrace' fgpt:aBCcdiT 'ktrace' fgpt:aBCcdiT
'caffeinate' tw:dimsu # as of macOS's caffeinate(8) dated November 9, 2012
) )
# Commands that would need to skip one positional argument: # Commands that would need to skip one positional argument:
# flock # flock

1
tests/test-highlighting.zsh
View File

@ -29,6 +29,7 @@
# ------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------
export PATH
setopt NO_UNSET WARN_CREATE_GLOBAL setopt NO_UNSET WARN_CREATE_GLOBAL
# Required for add-zle-hook-widget. # Required for add-zle-hook-widget.