about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2005-09-09 16:55:21 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2005-09-09 16:55:21 +0000
commit58b9e731da1f2a4eac68e06e986c9c25adafc36e (patch)
tree99a462bd5edd33d80c57ffbee85f9063d0cdc2b2
parent7746eea52b8b5b3d6cc7cf89adc3d4f684461977 (diff)
downloadzsh-58b9e731da1f2a4eac68e06e986c9c25adafc36e.tar.gz
zsh-58b9e731da1f2a4eac68e06e986c9c25adafc36e.tar.xz
zsh-58b9e731da1f2a4eac68e06e986c9c25adafc36e.zip
21720: fix getrestchar() some more
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/zle_main.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f7468c72..3eacfc50c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-09  Peter Stephenson  <pws@csr.com>
 
+	* 21720: Src/Zle/zle_main.c: getrestchar() from 21709 didn't
+	return properly.
+
 	* d'après 21719: Src/builtin.c, Src/init.c, Src/params.c: Add some
 	mod_exports.
 
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 4f598b889..1b62ff027 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -814,7 +814,8 @@ getrestchar(int inchar)
 		 * timed out.  This probably indicates a duff character.
 		 * Return a '?'.
 		 */
-		lastchar_wide = L'?';
+		lastchar = '?';
+		return lastchar_wide = L'?';
 	    }
 	    else
 		return lastchar_wide = WEOF;