cvs diff: Diffing . Index: core.lisp =================================================================== RCS file: /cvsroot/stumpwm/stumpwm/core.lisp,v retrieving revision 1.52 diff -u -r1.52 core.lisp --- core.lisp 30 Aug 2006 05:03:08 -0000 1.52 +++ core.lisp 1 Sep 2006 11:13:06 -0000 @@ -723,12 +723,12 @@ (defun expand-frame (f amount dir) (ecase dir - ('left (decf (frame-x f) amount) + (left (decf (frame-x f) amount) (incf (frame-width f) amount)) - ('right (incf (frame-width f) amount)) - ('top (decf (frame-y f) amount) + (right (incf (frame-width f) amount)) + (top (decf (frame-y f) amount) (incf (frame-height f) amount)) - ('bottom (incf (frame-height f) amount)))) + (bottom (incf (frame-height f) amount)))) (defun expand-tree (tree amount dir) "expand the frames in tree by AMOUNT in DIR direction. DIR can be 'top 'bottom 'left 'right" @@ -752,10 +752,10 @@ ;; half. (expand-tree a amount dir) (expand-tree a (- n) (ecase dir - ('left 'right) - ('right 'left) - ('top 'bottom) - ('bottom 'top))) + (left 'right) + (right 'left) + (top 'bottom) + (bottom 'top))) ;; the other side simple needs to be expanded half ;; the amount. (expand-tree b n dir))))))) @@ -825,11 +825,11 @@ ;; if FRAME is taking up the whole DIM or if AMOUNT = 0, do nothing (unless (or (zerop amount) (case dim - ('width (eq (screen-width screen) (frame-width frame))) - ('height (eq (screen-height screen) (frame-height frame))))) + (width (eq (screen-width screen) (frame-width frame))) + (height (eq (screen-height screen) (frame-height frame))))) (let* ((split-pred (ecase dim - ('width #'tree-column-split) - ('height #'tree-row-split))) + (width #'tree-column-split) + (height #'tree-row-split))) (a-branch (spree-root-branch tree (lambda (b) (funcall split-pred b)) @@ -839,16 +839,16 @@ (values (first a-branch) (second a-branch)) (values (second a-branch) (first a-branch))) (let ((dir (ecase dim - ('width (if (< (tree-x a) (tree-x b)) + (width (if (< (tree-x a) (tree-x b)) 'right 'left)) - ('height (if (< (tree-y a) (tree-y b)) + (height (if (< (tree-y a) (tree-y b)) 'bottom 'top))))) (expand-tree a amount dir) (expand-tree b (- amount) (ecase dir - ('left 'right) - ('right 'left) - ('top 'bottom) - ('bottom 'top))) + (left 'right) + (right 'left) + (top 'bottom) + (bottom 'top))) (tree-iterate a-branch (lambda (leaf) (sync-frame-windows screen leaf))))))))) Index: stumpwm.lisp =================================================================== RCS file: /cvsroot/stumpwm/stumpwm/stumpwm.lisp,v retrieving revision 1.40 diff -u -r1.40 stumpwm.lisp --- stumpwm.lisp 22 Jun 2006 17:49:31 -0000 1.40 +++ stumpwm.lisp 1 Sep 2006 11:13:06 -0000 @@ -61,7 +61,7 @@ "Handle X errors" (declare (ignore display asynchronous)) (case error-key - ('xlib:access-error + (xlib:access-error (error "Another window manager is running.")) (t (dformat "Error ~S ~S~%" error-key key-vals))))