diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-11-08 21:59:58 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-11-08 21:59:58 +0000 |
| commit | 65f56b565666690a878cedfbf3f24f364e58a8a5 (patch) | |
| tree | b1a5f1b86ada872e00e3023b51fedfa11812c263 | |
| parent | 0ccbc3873f7023a717973e9fe2a4e94317b35ad4 (diff) | |
| download | zsh-65f56b565666690a878cedfbf3f24f364e58a8a5.tar.gz zsh-65f56b565666690a878cedfbf3f24f364e58a8a5.tar.xz zsh-65f56b565666690a878cedfbf3f24f364e58a8a5.zip | |
33655: remove overlap of node flags
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/zsh.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 7c0ffb1c2..55d181658 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-11-08 Peter Stephenson <p.w.stephenson@ntlworld.com> + * 33655: Src/zsh.h: remove overlap of node flags. + * 33653: Src/builtin.c: handle -a option to whence in combination with -m. diff --git a/Src/zsh.h b/Src/zsh.h index d284c7aa7..031deaf3f 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -1865,9 +1865,9 @@ typedef groupset *Groupset; #define PRINT_TYPESET (1<<5) /* flags for printing for the whence builtin */ -#define PRINT_WHENCE_CSH (1<<5) -#define PRINT_WHENCE_VERBOSE (1<<6) -#define PRINT_WHENCE_SIMPLE (1<<7) +#define PRINT_WHENCE_CSH (1<<6) +#define PRINT_WHENCE_VERBOSE (1<<7) +#define PRINT_WHENCE_SIMPLE (1<<8) #define PRINT_WHENCE_FUNCDEF (1<<9) #define PRINT_WHENCE_WORD (1<<10) |