Skip to content

Fix s.makeWindow #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jxa wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix s.makeWindow #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions el/sclang-interp.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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"
Expand Down
17 changes: 5 additions & 12 deletions sc/scide_scel/EmacsBuffer.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
}
}
Expand Down Expand Up @@ -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})
Expand All @@ -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}
Expand Down