aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2011-07-12 11:03:58 +1000
committernyamatongwe <devnull@localhost>2011-07-12 11:03:58 +1000
commitf13439edc92769e5964b18a758ad12dc3bf4f351 (patch)
treed27df4fe23eacd9235b27120a67cfd2cb05c3ecd
parent6002a49b1d3ff27b70eaa45b36d020e1859ee7d8 (diff)
downloadscintilla-mirror-f13439edc92769e5964b18a758ad12dc3bf4f351.tar.gz
Fix Shift-JIS lead byte ranges to match Windows.
-rw-r--r--cocoa/PlatCocoa.mm3
-rw-r--r--gtk/PlatGTK.cxx3
-rw-r--r--src/Document.cxx3
3 files changed, 6 insertions, 3 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 6c1c5e8c4..75803e33b 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -2075,7 +2075,8 @@ bool Platform::IsDBCSLeadByte(int codePage, char ch)
case 932:
// Shift_jis
return ((uch >= 0x81) && (uch <= 0x9F)) ||
- ((uch >= 0xE0) && (uch <= 0xEF));
+ ((uch >= 0xE0) && (uch <= 0xFC));
+ // Lead bytes F0 to FC may be a Microsoft addition.
case 936:
// GBK
return (uch >= 0x81) && (uch <= 0xFE);
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index e323b0ad1..b8ee6b385 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -2975,7 +2975,8 @@ bool Platform::IsDBCSLeadByte(int codePage, char ch) {
case 932:
// Shift_jis
return ((uch >= 0x81) && (uch <= 0x9F)) ||
- ((uch >= 0xE0) && (uch <= 0xEF));
+ ((uch >= 0xE0) && (uch <= 0xFC));
+ // Lead bytes F0 to FC may be a Microsoft addition.
case 936:
// GBK
return (uch >= 0x81) && (uch <= 0xFE);
diff --git a/src/Document.cxx b/src/Document.cxx
index 8a825650a..8f135fb4d 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -662,7 +662,8 @@ bool SCI_METHOD Document::IsDBCSLeadByte(char ch) const {
case 932:
// Shift_jis
return ((uch >= 0x81) && (uch <= 0x9F)) ||
- ((uch >= 0xE0) && (uch <= 0xEF));
+ ((uch >= 0xE0) && (uch <= 0xFC));
+ // Lead bytes F0 to FC may be a Microsoft addition.
case 936:
// GBK
return (uch >= 0x81) && (uch <= 0xFE);