summaryrefslogtreecommitdiff
path: root/Src/Zle/comp.h
diff options
context:
space:
mode:
authorFrank Terbeck <ft@bewatermyfriend.org>2011-06-02 10:50:35 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2011-06-02 10:50:35 +0200
commit2438a0e95aa448f0aeda468752444306b44fe7d0 (patch)
tree8477e9c6af360f6a89af13e8cb5f2a4f9c1cff2c /Src/Zle/comp.h
parentb495ba1e5a3ab1396844490ad8cad17dec23d6c1 (diff)
parent21266db1d9ae433bf1dcb196a4e258c00541b599 (diff)
downloadzsh-2438a0e95aa448f0aeda468752444306b44fe7d0.tar.gz
zsh-2438a0e95aa448f0aeda468752444306b44fe7d0.zip
Merge commit 'zsh-4.3.12' into debian
Diffstat (limited to 'Src/Zle/comp.h')
-rw-r--r--Src/Zle/comp.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/Src/Zle/comp.h b/Src/Zle/comp.h
index e96c4217c..34da2cabb 100644
--- a/Src/Zle/comp.h
+++ b/Src/Zle/comp.h
@@ -76,6 +76,9 @@ struct cmgroup {
int totl; /* total length */
int shortest; /* length of shortest match */
Cmgroup perm; /* perm. alloced version of this group */
+#ifdef ZSH_HEAP_DEBUG
+ Heapid heap_id;
+#endif
};
@@ -323,8 +326,8 @@ struct cadata {
typedef struct cldata *Cldata;
struct cldata {
- int columns; /* screen width */
- int lines; /* screen height */
+ int zterm_columns; /* screen width */
+ int zterm_lines; /* screen height */
int menuacc; /* value of global menuacc */
int valid; /* no need to calculate anew */
int nlist; /* number of matches to list */