about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-04-26 19:45:54 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-04-26 19:45:54 +0000
commitc8b6d1a239772aad349412e02d0291d3b64edb72 (patch)
tree7d0237f759c8724e55e81153d231ddf713820a47
parent31ca309299f8f82cda30edce496108d2687261b7 (diff)
downloadzsh-c8b6d1a239772aad349412e02d0291d3b64edb72.tar.gz
zsh-c8b6d1a239772aad349412e02d0291d3b64edb72.tar.xz
zsh-c8b6d1a239772aad349412e02d0291d3b64edb72.zip
24872: revert to original patch
-rw-r--r--ChangeLog3
-rw-r--r--Src/hist.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fb668d49..7c0cc35f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
 2008-04-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
-	* 24872 (revised 24873): Jun T.: Fix capitalization with
-	combining characters.
+	* 24872: Jun T.: Fix capitalization with combining characters.
 
 	* 24869: Marc Chantreux: configure.ac, Src/init.c: make default
 	readnullcmd configurable.
diff --git a/Src/hist.c b/Src/hist.c
index 90183287d..e7f211dd5 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -1567,10 +1567,8 @@ casemodify(char *str, int how)
 
 	    case CASMOD_CAPS:
 	    default:		/* shuts up compiler */
-#ifdef MULTIBYTE_SUPPORT
 		if (IS_COMBINING(wc))
 			break;
-#endif
 		if (!iswalnum(wc))
 		    nextupper = 1;
 		else if (nextupper) {