1.1 --- a/view.c	Fri Jan 05 15:37:10 2007 +0100
     1.2 +++ b/view.c	Fri Jan 05 16:35:45 2007 +0100
     1.3 @@ -32,17 +32,17 @@
     1.4  static void
     1.5  swap(Client *c1, Client *c2) {
     1.6  	Client tmp = *c1;
     1.7 -	Client *cp = c1->prev;
     1.8 -	Client *cn = c1->next;
     1.9 +	Client *c1p = c1->prev;
    1.10 +	Client *c1n = c1->next;
    1.11 +	Client *c2p = c2->prev;
    1.12 +	Client *c2n = c2->next;
    1.13  
    1.14  	*c1 = *c2;
    1.15 -	c1->prev = cp;
    1.16 -	c1->next = cn;
    1.17 -	cp = c2->prev;
    1.18 -	cn = c2->next;
    1.19  	*c2 = tmp;
    1.20 -	c2->prev = cp;
    1.21 -	c2->next = cn;
    1.22 +	c1->prev = c1p;
    1.23 +	c1->next = c1n;
    1.24 +	c2->prev = c2p;
    1.25 +	c2->next = c2n;
    1.26  }
    1.27  
    1.28  static void
    1.29 @@ -192,10 +192,9 @@
    1.30  
    1.31  void
    1.32  incnmaster(Arg *arg) {
    1.33 -	if(nmaster + arg->i < 1 || (wah / (nmaster + arg->i) < bh))
    1.34 +	if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
    1.35  		return;
    1.36  	nmaster += arg->i;
    1.37 -
    1.38  	arrange();
    1.39  }
    1.40  
    1.41 @@ -305,7 +304,9 @@
    1.42  		n++;
    1.43  
    1.44  	c = sel;
    1.45 -	if(n <= nmaster || (arrange == dofloat))
    1.46 +	if(arrange == dofloat)
    1.47 +		return;
    1.48 +	else if(n <= nmaster)
    1.49  		pop(c);
    1.50  	else if(ismaster(sel)) {
    1.51  		if(!(c = topofstack()))