diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-05 00:09:56 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-05 00:09:56 +0000 |
| commit | 542b84358933e363773afe2105c9fa5ee494e18b (patch) | |
| tree | e0d47552102f9345daf0ebe6a03ae6487a78c0c3 /Src/zsh.h | |
| parent | 372555ff201bad639c4b50411293cfd872e31728 (diff) | |
| download | zsh-542b84358933e363773afe2105c9fa5ee494e18b.tar.gz zsh-542b84358933e363773afe2105c9fa5ee494e18b.tar.xz zsh-542b84358933e363773afe2105c9fa5ee494e18b.zip | |
Reverse the merging of 21296 onto 4.2 branch; the builtin.c piece had a merge conflict, and my resolution of it caused test failure in C03.
Diffstat (limited to 'Src/zsh.h')
| -rw-r--r-- | Src/zsh.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Src/zsh.h b/Src/zsh.h index 4fc476083..f4646fb93 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -1866,8 +1866,7 @@ struct heap { /* Mask to get the above flags */ #define ZSIG_MASK (ZSIG_TRAPPED|ZSIG_IGNORED|ZSIG_FUNC) /* No. of bits to shift local level when storing in sigtrapped */ -#define ZSIG_ALIAS (1<<3) /* Trap is stored under an alias */ -#define ZSIG_SHIFT 4 +#define ZSIG_SHIFT 3 /**********************************/ /* Flags to third argument of zle */ |