From dee676e2d02e14ed1cc6795920afb98675851cc3 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Tue, 30 Mar 2021 20:22:20 -0700
Subject: [PATCH] ui: minor style tweaks/fixes.

---
 basis/ui/gadgets/editors/editors.factor | 5 +++--
 basis/ui/tools/tools.factor             | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index b5df92e768..03d09b62ae 100644
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -581,8 +581,8 @@ editor "selection" f {
 } os macosx? [ {
     { T{ key-down f { S+ M+ } "LEFT" } select-start-of-line }
     { T{ key-down f { S+ M+ } "RIGHT" } select-end-of-line }
-    { T{ key-down f ${ S+ M+ } "UP" } select-start-of-paragraph }
-    { T{ key-down f ${ S+ M+ } "DOWN" } select-end-of-paragraph }
+    { T{ key-down f { S+ M+ } "UP" } select-start-of-paragraph }
+    { T{ key-down f { S+ M+ } "DOWN" } select-end-of-paragraph }
     { T{ key-down f { S+ M+ } "HOME" } select-start-of-document }
     { T{ key-down f { S+ M+ } "END" } select-end-of-document }
 } append ] when define-command-map
@@ -693,6 +693,7 @@ multiline-editor "multiline" f {
     { T{ key-down f f "RET" } insert-newline }
     { T{ key-down f { S+ } "RET" } insert-newline }
     { T{ key-down f f "ENTER" } insert-newline }
+    { T{ key-down f { S+ } "ENTER" } insert-newline }
     { T{ key-down f { C+ } "j" } com-join-lines }
 } os unix? [ {
     { T{ key-down f { C+ } "p" } previous-line }
diff --git a/basis/ui/tools/tools.factor b/basis/ui/tools/tools.factor
index 5def6828a2..ed7ea6f6c0 100644
--- a/basis/ui/tools/tools.factor
+++ b/basis/ui/tools/tools.factor
@@ -22,8 +22,8 @@ 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 ${ 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? {
-- 
2.34.1