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

Modified Files: buffer.lisp gui.lisp Log Message: Fixes for ESA changes from Troels Henriksen.

--- /project/gsharp/cvsroot/gsharp/buffer.lisp 2006/06/19 17:40:34 1.38 +++ /project/gsharp/cvsroot/gsharp/buffer.lisp 2006/09/14 14:34:47 1.39 @@ -1253,7 +1253,7 @@ (*readtable* readtable)) (read stream))))

-(defmethod save-buffer-to-stream ((buffer buffer) stream) +(defmethod frame-save-buffer-to-stream (application-frame (buffer buffer) stream) (let ((*print-circle* t) (*package* (find-package :keyword))) ;; (format stream "G#V3~%") --- /project/gsharp/cvsroot/gsharp/gui.lisp 2006/08/02 02:14:44 1.71 +++ /project/gsharp/cvsroot/gsharp/gui.lisp 2006/09/14 14:34:47 1.72 @@ -122,7 +122,7 @@ (windows application-frame)) :test #'eq))

-(defmethod current-buffer ((application-frame gsharp)) +(defmethod frame-current-buffer ((application-frame gsharp)) (buffer (view (car (windows application-frame)))))

(defun current-cursor () @@ -300,7 +300,7 @@ (setf (input-state *application-frame*) input-state (staves (car (layers (car (segments buffer))))) (list staff))))

-(defmethod find-file :around (filepath (application-frame gsharp)) +(defmethod frame-find-file :around ((application-frame gsharp) filepath) (declare (ignore filepath)) (let* ((buffer (call-next-method)) (input-state (make-input-state)) @@ -1299,8 +1299,8 @@ ;;; ;;; I/O

-(defmethod make-buffer-from-stream (stream (frame gsharp)) +(defmethod frame-make-buffer-from-stream ((frame gsharp) stream) (read-buffer-from-stream stream))

-(defmethod make-new-buffer ((frame gsharp)) - (make-instance 'buffer)) \ No newline at end of file +(defmethod frame-make-new-buffer ((frame gsharp) &key &allow-other-keys) + (make-instance 'buffer))