1.1 --- a/config.mk	Fri Jan 05 15:37:10 2007 +0100
     1.2 +++ b/config.mk	Fri Jan 05 16:35:45 2007 +0100
     1.3 @@ -17,8 +17,8 @@
     1.4  # flags
     1.5  CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
     1.6  LDFLAGS = ${LIBS}
     1.7 -#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
     1.8 -#LDFLAGS = -g ${LIBS}
     1.9 +CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
    1.10 +LDFLAGS = -g ${LIBS}
    1.11  
    1.12  # Solaris
    1.13  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"

     2.1 --- a/view.c	Fri Jan 05 15:37:10 2007 +0100
     2.2 +++ b/view.c	Fri Jan 05 16:35:45 2007 +0100
     2.3 @@ -32,17 +32,17 @@
     2.4  static void
     2.5  swap(Client *c1, Client *c2) {
     2.6  	Client tmp = *c1;
     2.7 -	Client *cp = c1->prev;
     2.8 -	Client *cn = c1->next;
     2.9 +	Client *c1p = c1->prev;
    2.10 +	Client *c1n = c1->next;
    2.11 +	Client *c2p = c2->prev;
    2.12 +	Client *c2n = c2->next;
    2.13  
    2.14  	*c1 = *c2;
    2.15 -	c1->prev = cp;
    2.16 -	c1->next = cn;
    2.17 -	cp = c2->prev;
    2.18 -	cn = c2->next;
    2.19  	*c2 = tmp;
    2.20 -	c2->prev = cp;
    2.21 -	c2->next = cn;
    2.22 +	c1->prev = c1p;
    2.23 +	c1->next = c1n;
    2.24 +	c2->prev = c2p;
    2.25 +	c2->next = c2n;
    2.26  }
    2.27  
    2.28  static void
    2.29 @@ -192,10 +192,9 @@
    2.30  
    2.31  void
    2.32  incnmaster(Arg *arg) {
    2.33 -	if(nmaster + arg->i < 1 || (wah / (nmaster + arg->i) < bh))
    2.34 +	if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
    2.35  		return;
    2.36  	nmaster += arg->i;
    2.37 -
    2.38  	arrange();
    2.39  }
    2.40  
    2.41 @@ -305,7 +304,9 @@
    2.42  		n++;
    2.43  
    2.44  	c = sel;
    2.45 -	if(n <= nmaster || (arrange == dofloat))
    2.46 +	if(arrange == dofloat)
    2.47 +		return;
    2.48 +	else if(n <= nmaster)
    2.49  		pop(c);
    2.50  	else if(ismaster(sel)) {
    2.51  		if(!(c = topofstack()))