[gsharp-cvs] CVS gsharp

[crhodes]

Update of /project/gsharp/cvsroot/gsharp
In directory clnet:/tmp/cvs-serv24335

Modified Files:
	gui.lisp modes.lisp 
Log Message:
Reducing my deviation from upstream, part $n$: M-: support.


--- /project/gsharp/cvsroot/gsharp/gui.lisp	2007/07/05 21:13:03	1.80
+++ /project/gsharp/cvsroot/gsharp/gui.lisp	2007/07/06 14:16:20	1.81
@@ -579,6 +579,26 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
+;;; development and debugging aids
+
+;;; FIXME: you might expect that this was in an ESA component, but in
+;;; fact it's not.  Maybe it should be?
+(define-gsharp-command (com-eval-expression :name t)
+    ((expression 'expression :prompt "Eval"))
+  "Prompt for and evaluate a lisp expression.
+Prints the results in the minibuffer."
+  (let* ((*package* (find-package :gsharp))
+         (values (multiple-value-list
+                  (handler-case (eval expression)
+                    (error (condition) 
+                      (beep)
+                      (display-message "~a" condition)
+                      (return-from com-eval-expression nil)))))
+         (result (format nil "~:[; No values~;~:*~{~S~^,~}~]" values)))
+    (display-message result)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;
 ;;; note insertion commands
 
 (defun insert-cluster ()
--- /project/gsharp/cvsroot/gsharp/modes.lisp	2007/06/28 14:36:14	1.26
+++ /project/gsharp/cvsroot/gsharp/modes.lisp	2007/07/06 14:16:20	1.27
@@ -39,6 +39,9 @@
 (set-key 'com-istate-fewer-lbeams 'global-gsharp-table '((#\i) (#\x) (#\[)))
 (set-key 'com-istate-fewer-rbeams 'global-gsharp-table '((#\i) (#\x) (#\])))
 
+(set-key `(com-eval-expression ,*unsupplied-argument-marker*) 
+         'global-gsharp-table '((#\: :meta)))
+
 ;;; the melody table contains commands that are specific to the 
 ;;; melody layer