ui.tools: merge mac and other config.

diff --git a/basis/ui/tools/tools.factor b/basis/ui/tools/tools.factor
index b24cecb08201647b9e3a326811eb360bab012f6c..5def6828a2a1cbd8bf7ce7b9810030915d084e6c 100644 (file)
--- a/basis/ui/tools/tools.factor
+++ b/basis/ui/tools/tools.factor
@@ -22,14 +22,13 @@ tool "tool-switching" f {
 } define-command-map
 
 tool "common" f {
+    { T{ key-down f ${ os macosx? M+ C+ } "w" } close-window }
+    { T{ key-down f ${ os macosx? M+ C+ } "q" } com-exit }
     { T{ key-down f f "F2" } refresh-all }
     { T{ key-down f f "F3" } show-error-list }
 } os macosx? {
-    { T{ key-down f { M+ } "w" } close-window }
-    { T{ key-down f { M+ } "q" } com-exit }
     { T{ key-down f { C+ M+ } "f" } toggle-fullscreen }
 } {
-    { T{ key-down f { C+ } "w" } close-window }
     { T{ key-down f { C+ } "F4" } close-window }
     { T{ key-down f { A+ } "F4" } com-exit }
     { T{ key-down f f "F11" } toggle-fullscreen }