[mcclim-cvs] CVS mcclim/Drei

[thenriksen]

Update of /project/mcclim/cvsroot/mcclim/Drei
In directory clnet:/tmp/cvs-serv22830/Drei

Modified Files:
	drei.lisp kill-ring.lisp 
Log Message:
Drei kill rings are now global.


--- /project/mcclim/cvsroot/mcclim/Drei/drei.lisp	2008/02/03 08:38:25	1.37
+++ /project/mcclim/cvsroot/mcclim/Drei/drei.lisp	2008/03/28 21:09:43	1.38
@@ -240,12 +240,6 @@
 whenever this Drei is being displayed. During redisplay, the
 `stream-default-view' of the output stream will be temporarily
 bound to this value.")
-   (%kill-ring :initform (make-instance 'kill-ring :max-size 7)
-               :initarg :kill-ring
-               :accessor kill-ring
-               :type kill-ring
-               :documentation "The kill ring object associated
-with the Drei instance.")
    (%previous-command :initform nil
                       :accessor previous-command
                       :documentation "The previous CLIM command
@@ -507,12 +501,12 @@
 proper values, taken from `drei-instance'. The keyword arguments
 can be used to provide forms that will be used to obtain values
 for the respective special variables, instead of finding their
-value in `drei-instance'. This macro binds all of the usual Drei
-special variables, but also some CLIM special variables needed
-for ESA-style command parsing."
+value in `drei-instance' or their existing binding. This macro
+binds all of the usual Drei special variables, but also some CLIM
+special variables needed for ESA-style command parsing."
   `(let* ((*esa-instance* ,drei-instance)
           (*kill-ring* ,(if kill-ring-p kill-ring
-                            `(kill-ring (drei-instance))))
+                            '*kill-ring*))
           (*minibuffer* ,(if minibuffer-p minibuffer
                              `(find-available-minibuffer (drei-instance))))
           (*command-parser* ,(if command-parser-p command-parser
--- /project/mcclim/cvsroot/mcclim/Drei/kill-ring.lisp	2006/12/04 19:22:02	1.4
+++ /project/mcclim/cvsroot/mcclim/Drei/kill-ring.lisp	2008/03/28 21:09:43	1.5
@@ -187,6 +187,6 @@
   (if reset (reset-yank-position kr))
   (element> (kill-ring-cursor kr)))
 
-(defparameter *kill-ring* nil
+(defparameter *kill-ring* (make-instance 'kill-ring :max-size 7)
   "This special variable is bound to the kill ring of the running
 application or Drei instance whenever a command is executed.")