From bf4b222fd6d61838653ceb0fdcf34cd85eca43d1 Mon Sep 17 00:00:00 2001
From: John Andrews <john.m.andrews@gmail.com>
Date: Sat, 4 Sep 2021 15:14:22 -0400
Subject: [PATCH] Fix s.makeWindow

---
 el/sclang-interp.el          |  6 +++---
 sc/scide_scel/EmacsBuffer.sc | 17 +++++------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/el/sclang-interp.el b/el/sclang-interp.el
index b836347..8d7c3ea 100644
--- a/el/sclang-interp.el
+++ b/el/sclang-interp.el
@@ -467,9 +467,9 @@ Change this if \"cat\" has a non-standard name or location."
 (defun sclang-default-command-handler (fun arg)
   "Default command handler.
 Displays short message on error."
-  (condition-case nil
+  (condition-case err
       (funcall fun arg)
-    (error (sclang-message "Error in command handler") nil)))
+    (error (sclang-message (format "Error in command handler: %s" err)) nil)))
 
 (defun sclang-debug-command-handler (fun arg)
   "Debugging command handler.
@@ -489,7 +489,7 @@ With arg, activate debugging iff arg is positive."
 	(if (or (and arg (> arg 0))
 		(eq sclang-command-handler 'sclang-debug-command-handler))
 	    'sclang-default-command-handler
-	  'sclang-default-command-handler))
+	  'sclang-debug-command-handler))
   (sclang-message "Command handler debugging %s."
 		  (if (eq sclang-command-handler 'sclang-debug-command-handler)
 		      "enabled"
diff --git a/sc/scide_scel/EmacsBuffer.sc b/sc/scide_scel/EmacsBuffer.sc
index e86664f..2e49049 100644
--- a/sc/scide_scel/EmacsBuffer.sc
+++ b/sc/scide_scel/EmacsBuffer.sc
@@ -118,26 +118,26 @@ EmacsWidget {
 	wPut {|argKey, argValue, handler|
 		Emacs.evalLispExpression(
 			buffer.use(['widget-put',
-				[\cdr, [\find, id, 'sclang-widgets', ':key', [\quote, \car]]],
+				[\cdr, ['cl-find', id, 'sclang-widgets', ':key', [\quote, \car]]],
 				(':'++argKey).asSymbol,
 				[\quote, argValue]]).asLispString, handler)
 	}
 	wValueSet {|argValue, handler|
 		Emacs.evalLispExpression(
 			buffer.use(['widget-value-set',
-				[\cdr, [\find, id, 'sclang-widgets', ':key', [\quote, \car]]],
+				[\cdr, ['cl-find', id, 'sclang-widgets', ':key', [\quote, \car]]],
 				argValue]).asLispString, handler)
 	}
 	enabled_ {|argValue, handler|
 		if (argValue) {
 			Emacs.evalLispExpression(
 				buffer.use(['widget-apply',
-					[\cdr, [\find, id, 'sclang-widgets', ':key', [\quote, \car]]],
+					[\cdr, ['cl-find', id, 'sclang-widgets', ':key', [\quote, \car]]],
 					':activate'], \nil).asLispString, {enabled=true;handler.value})
 		} {
 			Emacs.evalLispExpression(
 				buffer.use(['widget-apply',
-					[\cdr, [\find, id, 'sclang-widgets', ':key', [\quote, \car]]],
+					[\cdr, ['cl-find', id, 'sclang-widgets', ':key', [\quote, \car]]],
 					':deactivate'], \nil).asLispString, {enabled=false;handler.value})
 		}
 	}
@@ -199,7 +199,7 @@ EmacsNumber : EmacsWidget {
 		Emacs.evalLispExpression(
 			buffer.use(
 				['save-excursion',
-					['widget-value-set', [\cdr, [\find, id, 'sclang-widgets', ':key', [\quote, \car]]], argValue],
+					['widget-value-set', [\cdr, ['cl-find', id, 'sclang-widgets', ':key', [\quote, \car]]], argValue],
 					['widget-setup']],
 				argValue).asLispString,
 			{|result|value=result})
@@ -226,13 +226,6 @@ EmacsButton : EmacsWidget {
 	states_ {|argStates|
 		states=argStates;
 		Emacs.sendToLisp(\_widgetSetStates, [buffer.name, id, states, value]);
-		/*		Emacs.evalLispExpression(
-			buffer.use(
-				[\let, [[\widget, [\cdr, [\find, id, 'sclang-widgets', ':key', [\quote, \car]]]],
-					[\states, [\quote, states]]],
-					['widget-put', \widget, ':states', \states],
-					['widget-value-set', \widget, [\nth, value, \states]]]
-			).asLispString) */
 	}
 	initStates {|argStates|states=argStates}
 	initValue {|argValue|value=argValue}