about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Functions/Zle/incremental-complete-word2
-rw-r--r--Src/Zle/zle_refresh.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b1b5ad927..48a65703c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-22  Peter Stephenson  <pws@csr.com>
+
+	* 23791: Src/Zle/zle_refresh.c: use VARARR for arrays with
+	MB_CUR_MAX.
+
+	* users/11791: Functions/Zle/incremental-complete-word:
+	missing "emulate -L zsh": was commented out, not sure why.
+
 2007-08-21  Clint Adams  <clint@zsh.org>
 
 	* 23788: Doc/Zsh/mod_files.yo, Src/Modules/files.c: add -h option
diff --git a/Functions/Zle/incremental-complete-word b/Functions/Zle/incremental-complete-word
index b1e8e1c52..67a9d4744 100644
--- a/Functions/Zle/incremental-complete-word
+++ b/Functions/Zle/incremental-complete-word
@@ -22,7 +22,7 @@
 # The main widget function.
 
 incremental-complete-word() {
-  #emulate -L zsh
+  emulate -L zsh
   unsetopt autolist menucomplete automenu # doesn't work well
 
   local key lbuf="$LBUFFER" rbuf="$RBUFFER" pmpt pstr word
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index 6c14b773d..a936a1399 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -179,9 +179,9 @@ void
 zwcputc(ZLE_INT_T c)
 {
 #ifdef MULTIBYTE_SUPPORT
-    char mbtmp[MB_CUR_MAX + 1];
     mbstate_t mbstate;
     int i;
+    VARARR(char, mbtmp, MB_CUR_MAX + 1);
 
     if (c == WEOF)
 	return;