From 4a25db734535809978a61756561c91ed052818af Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com" <cmanske%netscape.com>
Date: Tue, 9 Jan 2001 21:38:47 +0000
Subject: [PATCH] Use global overlay for 'Exit/Quit' menuitem, requiring moving
 of overlay includes, b=54584, r=ducarroz, sr=syd

---
 editor/ui/composer/content/TextEditorAppShell.xul | 3 ++-
 editor/ui/composer/content/editorOverlay.xul      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/editor/ui/composer/content/TextEditorAppShell.xul b/editor/ui/composer/content/TextEditorAppShell.xul
index 0754d1f059c9..7bc38c4d8c55 100644
--- a/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/editor/ui/composer/content/TextEditorAppShell.xul
@@ -24,9 +24,10 @@
   -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?> 
-<?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/editor.dtd"> 
 
diff --git a/editor/ui/composer/content/editorOverlay.xul b/editor/ui/composer/content/editorOverlay.xul
index ca3d9e6e0d3d..b035d7e71d50 100644
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -305,6 +305,7 @@
       <menuitem accesskey="&fileprintsetup.accesskey;" observes="cmd_printSetup" />
       <menuitem accesskey="&fileprint.accesskey;"      observes="cmd_print" value="&printCmd.label;"/>
       <menuseparator/>
+      <!-- The Exit/Quit item is merged from platformGlobalOverlay.xul -->
     </menupopup>
   </menu>