Bug 110517 ctrl-k doesn't work in mail/news composer on unix

Changes check spelling binding for unix to ctrl-shift-k
patch by bz and me r=neil sr=sspitzer a=sspitzer

editor/ui/composer/content/editorOverlay.xul

@@ -25,7 +25,13 @@
    -   Stephen Donner (technutz@netscape.net)
 -->
 
-<!DOCTYPE overlay SYSTEM "chrome://editor/locale/editorOverlay.dtd">
+<!DOCTYPE overlay [
+<!ENTITY % editorOverlayDTD SYSTEM "chrome://editor/locale/editorOverlay.dtd">
+%editorOverlayDTD;
+<!ENTITY % platformCommunicatorDTD SYSTEM
+  "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
+%platformCommunicatorDTD;
+]>
 
 <overlay id="editorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -59,7 +65,12 @@
     <key id="findprevkb"        key="&editfindprev.keybinding;"        observes="cmd_findPrev"  modifiers="accel,shift"/>
     <key keycode="&editfindnext.keybinding2;" observes="cmd_findNext"/>
     <key keycode="&editfindprev.keybinding2;" observes="cmd_findPrev" modifiers="shift"/>
-    <key id="checkspellingkb"   key="&editcheckspelling.keybinding;"   observes="cmd_spelling"  modifiers="accel" disabled="true"/>
+    <key id="checkspellingkb"
+         key="&editcheckspelling.keybinding;"
+         observes="cmd_spelling"
+         modifiers="&accel.emacs_conflict;"
+         disabled="true"
+    />
 
     <key id="boldkb"         key="&stylebold.keybinding;"       observes="cmd_bold" modifiers="accel"/>
     <key id="italickb"       key="&styleitalic.keybinding;"     observes="cmd_italic" modifiers="accel"/>

mailnews/compose/resources/content/messengercompose.xul

@@ -47,6 +47,9 @@
 %messengerDTD;
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
+<!ENTITY % platformCommunicatorDTD SYSTEM
+  "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
+%platformCommunicatorDTD;
 ]>
 
 <window id="msgcomposeWindow"
@@ -169,7 +172,11 @@
   
   <!-- Options Menu -->
   <!-- key id="key_selectAddresses" xulkey="true" key="&selectAddressCmd.key;" command="cmd_selectAddress"/ -->
-  <key id="key_checkspelling"  key="&checkSpellingCmd.key;" command="cmd_spelling"  modifiers="accel"/>
+  <key id="key_checkspelling"
+       key="&checkSpellingCmd.key;"
+       command="cmd_spelling"  
+       modifiers="&accel.emacs_conflict;"
+  />
   
   <!-- Tab/F6 Keys -->
   <key keycode="VK_TAB" oncommand="SwitchElementFocus(event);" modifiers="control"/>

xpfe/communicator/resources/locale/en-US/mac/platformCommunicatorOverlay.dtd

@@ -17,3 +17,5 @@
 
 <!ENTITY findTypeTextCmd.key        "">
 <!ENTITY findTypeLinksCmd.key       "">
+
+<!ENTITY accel.emacs_conflict       "accel">

xpfe/communicator/resources/locale/en-US/unix/platformCommunicatorOverlay.dtd

@@ -15,3 +15,5 @@
 
 <!ENTITY findTypeTextCmd.key        "/">
 <!ENTITY findTypeLinksCmd.key       "'">
+
+<!ENTITY accel.emacs_conflict       "accel,shift">

xpfe/communicator/resources/locale/en-US/win/platformCommunicatorOverlay.dtd

@@ -1,5 +1,6 @@
 <!-- win -->
-<!-- LOCALIZATION NOTE : FILE Do not translate all the Cmd.key and accesskey --> 
+<!-- LOCALIZATION NOTE : FILE Do not translate "accel" or "shift",
+                         You may want to translate the Cmd.key and accesskey --> 
 
 <!ENTITY closeCmd.label			"Close">  
 <!ENTITY closeCmd.key			"W">  
@@ -15,3 +16,5 @@
 
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
+
+<!ENTITY accel.emacs_conflict       "accel">