summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/hist.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dc3b46ef2..1fb668d49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 24872 (revised 24873): 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 6deb009d5..90183287d 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -1567,6 +1567,10 @@ 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) {