[climacs-cvs] CVS climacs

[thenriksen]

Update of /project/climacs/cvsroot/climacs
In directory clnet:/tmp/cvs-serv26799

Modified Files:
	gui.lisp packages.lisp 
Log Message:
Added `switch-to-pane' restart for (setf view).


--- /project/climacs/cvsroot/climacs/gui.lisp	2008/01/17 11:30:47	1.253
+++ /project/climacs/cvsroot/climacs/gui.lisp	2008/01/18 07:16:22	1.254
@@ -116,6 +116,10 @@
               (window-displaying-view
                (restart-case
                    (error 'view-already-displayed :view view :window window-displaying-view)
+                 (switch-to-pane ()
+                  :report "Switch the active window to the one containing the view"
+                  (other-window window-displaying-view)
+                  view)
                  (remove-other-use ()
                   :report "Make the other window try to display some other view"
                   (setf (view window-displaying-view) (any-preferably-undisplayed-view))
@@ -129,7 +133,7 @@
                   (setf (view pane) (clone-view-for-climacs
                                      (pane-frame window-displaying-view) view)))
                  (cancel ()
-                  :report "Cancel the setting of the windows view and just return")))
+                  :report "Cancel the setting of the windows view and just return nil")))
               (t (call-next-method)))
       (when old-view-active
         (ensure-only-view-active (pane-frame pane) view)))))
--- /project/climacs/cvsroot/climacs/packages.lisp	2008/01/12 11:49:35	1.131
+++ /project/climacs/cvsroot/climacs/packages.lisp	2008/01/18 07:16:25	1.132
@@ -47,7 +47,7 @@
              #:view-setting-error #:view
              #:unknown-view
              #:view-already-displayed #:window
-             #:remove-other-use #:remove-other-pane #:clone-view #:cancel
+             #:switch-to-pane #:remove-other-use #:remove-other-pane #:clone-view #:cancel
              #:any-view #:any-undisplayed-view
              #:clone-view-for-climacs
              #:make-new-view-for-climacs