Merge Bug 366774
authorPhilip Chee <philip.chee@gmail.com>
Mon, 25 Apr 2011 02:21:14 +0800
changeset 68490 54b9f7d8db85cafbde935402b6429530ba459366
parent 68488 8db1df84708ca997c2d1ba1851324405a3f3d6c3 (current diff)
parent 68489 cb191997bd5ec77d33e3abb59e840f33ce212e6b (diff)
child 68492 8302f5191d9217b64471609fb8ba1f0edc14e1e6
push id19661
push userphilip.chee@gmail.com
push dateSun, 24 Apr 2011 18:25:41 +0000
treeherdermozilla-central@8302f5191d92 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs366774
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge Bug 366774
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1212,16 +1212,22 @@ pref("bidi.texttype", 1);
 pref("bidi.numeral", 0);
 // ------------------
 //  Support Mode
 // ------------------
 // 1 = mozillaBidisupport *
 // 2 = OsBidisupport
 // 3 = disableBidisupport
 pref("bidi.support", 1);
+// ------------------
+//  Charset Mode
+// ------------------
+// 1 = doccharactersetBidi *
+// 2 = defaultcharactersetBidi
+pref("bidi.characterset", 1);
 // Whether delete and backspace should immediately delete characters not
 // visually adjacent to the caret, or adjust the visual position of the caret
 // on the first keypress and delete the character on a second keypress
 pref("bidi.edit.delete_immediately", false);
 
 // Bidi caret movement style:
 // 0 = logical
 // 1 = visual