[climacs-cvs] CVS update: climacs/gui.lisp climacs/lisp-syntax.lisp climacs/packages.lisp

[Dave Murray]

Update of /project/climacs/cvsroot/climacs
In directory common-lisp.net:/tmp/cvs-serv16463

Modified Files:
	gui.lisp lisp-syntax.lisp packages.lisp 
Log Message:
Change climacs application frame to use global-climacs-table
Date: Thu Jul 28 22:36:36 2005
Author: dmurray

Index: climacs/gui.lisp
diff -u climacs/gui.lisp:1.166 climacs/gui.lisp:1.167
--- climacs/gui.lisp:1.166	Tue Jul 26 07:28:39 2005
+++ climacs/gui.lisp	Thu Jul 28 22:36:36 2005
@@ -52,6 +52,8 @@
 (define-application-frame climacs (standard-application-frame
 				   esa-frame-mixin)
   ((buffers :initform '() :accessor buffers))
+  (:command-table (global-climacs-table :inherit-from (global-esa-table)))
+  (:menu-bar nil)
   (:panes
    (win (let* ((extended-pane 
 		(make-pane 'extended-pane
@@ -159,9 +161,6 @@
 	do (when (modified-p buffer)
 	     (setf (needs-saving buffer) t))))	
 
-(make-command-table 'global-climacs-table :errorp nil
-		    :inherit-from '(global-esa-table keyboard-macro-table))
-
 (defmacro define-named-command (command-name args &body body)
   `(define-command ,(if (listp command-name)
 			`(, at command-name :name t :command-table global-climacs-table)
@@ -1232,7 +1231,7 @@
                   :gesture :select-other
                   :tester-definitive t
                   :menu nil
-                  :priority 11)
+                  :priority 10)
     (object)
   object)
 
@@ -1243,7 +1242,7 @@
   (display-message (format nil "~s" (accept 'symbol))))	 
 
 (define-named-command com-accept-lisp-string ()
-  (display-message (format nil "~s" (accept 'climacs-lisp-syntax::lisp-string))))
+  (display-message (format nil "~s" (accept 'lisp-string))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; 


Index: climacs/lisp-syntax.lisp
diff -u climacs/lisp-syntax.lisp:1.17 climacs/lisp-syntax.lisp:1.18
--- climacs/lisp-syntax.lisp:1.17	Tue Jul 26 07:28:39 2005
+++ climacs/lisp-syntax.lisp	Thu Jul 28 22:36:36 2005
@@ -1143,9 +1143,6 @@
 (define-presentation-type lisp-string () 
                           :description "lisp string")
 
-;(define-presentation-method presentation-typep (object (type lisp-string))
-;  (stringp object))
-
 (defmethod display-parse-tree ((parse-symbol complete-string-form) (syntax lisp-syntax) pane)
   (let ((children (children parse-symbol)))
     (if (third children)


Index: climacs/packages.lisp
diff -u climacs/packages.lisp:1.70 climacs/packages.lisp:1.71
--- climacs/packages.lisp:1.70	Tue Jul 26 07:28:39 2005
+++ climacs/packages.lisp	Thu Jul 28 22:36:36 2005
@@ -164,7 +164,7 @@
 (defpackage :climacs-lisp-syntax
   (:use :clim-lisp :clim :climacs-buffer :climacs-base 
 	:climacs-syntax :flexichain :climacs-pane)
-  (:export))
+  (:export :lisp-string))
 
 (defpackage :esa
   (:use :clim-lisp :clim)
@@ -179,5 +179,6 @@
 
 (defpackage :climacs-gui
   (:use :clim-lisp :clim :climacs-buffer :climacs-base :climacs-abbrev :climacs-syntax
-	:climacs-kill-ring :climacs-pane :clim-extensions :undo :esa))
+	:climacs-kill-ring :climacs-pane :clim-extensions :undo :esa)
+  (:import-from :climacs-lisp-syntax :lisp-string))