Update of /project/climacs/cvsroot/climacs
In directory clnet:/tmp/cvs-serv27038
Modified Files:
climacs-lisp-syntax-commands.lisp climacs-lisp-syntax.lisp
gui.lisp
Log Message:
Updated to keep up with Drei changes, in particular the improvements
to the Lisp syntax module.
--- /project/climacs/cvsroot/climacs/climacs-lisp-syntax-commands.lisp 2006/11/14 12:42:06 1.2
+++ /project/climacs/cvsroot/climacs/climacs-lisp-syntax-commands.lisp 2006/12/10 19:44:56 1.3
@@ -117,7 +117,7 @@
"Edit definition of the symbol at point.
If there is no symbol at point, this is a no-op."
(let* ((token (this-form *current-point* *current-syntax*))
- (this-symbol (token-to-object *current-syntax* token)))
+ (this-symbol (form-to-object *current-syntax* token)))
(when (and this-symbol (symbolp this-symbol))
(edit-definition this-symbol))))
--- /project/climacs/cvsroot/climacs/climacs-lisp-syntax.lisp 2006/11/14 12:42:06 1.2
+++ /project/climacs/cvsroot/climacs/climacs-lisp-syntax.lisp 2006/12/10 19:44:56 1.3
@@ -252,7 +252,7 @@
(defun macroexpand-token (syntax token &optional (all nil))
(with-syntax-package (syntax (start-offset token))
- (let* ((string (token-string syntax token))
+ (let* ((string (form-string syntax token))
(expression (read-from-string string))
(expansion (macroexpand-for-drei (get-usable-image syntax)
expression
@@ -275,7 +275,7 @@
(defun compile-definition-interactively (mark syntax)
(let* ((token (definition-at-mark mark syntax))
- (string (token-string syntax token))
+ (string (form-string syntax token))
(m (clone-mark mark))
(buffer-name (name (buffer syntax)))
(*read-base* (base syntax)))
@@ -284,7 +284,7 @@
(backward-definition m syntax)
(multiple-value-bind (result notes)
(compile-form-for-drei (get-usable-image syntax)
- (token-to-object syntax token
+ (form-to-object syntax token
:read t
:package (package-at-mark syntax mark))
(buffer syntax)
--- /project/climacs/cvsroot/climacs/gui.lisp 2006/11/22 18:27:03 1.233
+++ /project/climacs/cvsroot/climacs/gui.lisp 2006/12/10 19:44:56 1.234
@@ -295,13 +295,17 @@
"")
pane))))
+(defmethod handle-drei-condition ((drei climacs-pane) condition)
+ (call-next-method)
+ (display-drei drei))
+
(defmethod execute-frame-command :around ((frame climacs) command)
(handling-drei-conditions
(with-undo ((buffers frame))
- (call-next-method))
- (loop for buffer in (buffers frame)
- do (when (modified-p buffer)
- (clear-modify buffer)))))
+ (call-next-method)))
+ (loop for buffer in (buffers frame)
+ do (when (modified-p buffer)
+ (clear-modify buffer))))
(defmethod execute-frame-command :after ((frame climacs) command)
(when (eq frame *application-frame*)
