collapse client and group {r,}cycle defines since they are really

the same thing.

ok oga@

2 files changed, 5 insertions, 9 deletions

diff --git a/calmwm.h b/calmwm.h
index b873406..ac577a4 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.126 2011/05/15 17:58:47 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.127 2011/06/24 05:30:42 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -67,14 +67,10 @@
 #define	CWM_EXEC_PROGRAM	0x0001
 #define	CWM_EXEC_WM		0x0002
 
-/* client cycle */
+/* cycle */
 #define CWM_CYCLE		0
 #define CWM_RCYCLE		1
 
-/* group cycle */
-#define CWM_CYCLEGROUP		0
-#define CWM_RCYCLEGROUP		1
-
 #define KBTOGROUP(X) ((X) - 1)
 
 union arg {
diff --git a/conf.c b/conf.c
index 0536ac3..fac1ef3 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: conf.c,v 1.79 2011/05/11 13:53:51 okan Exp $
+ * $OpenBSD: conf.c,v 1.80 2011/06/24 05:30:42 okan Exp $
  */
 
 #include <sys/param.h>
@@ -356,8 +356,8 @@ static struct {
 	{ "movetogroup9", kbfunc_client_movetogroup, KBFLAG_NEEDCLIENT,
 	    {.i = 9} },
 	{ "nogroup", kbfunc_client_nogroup, 0, {0} },
-	{ "cyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_CYCLEGROUP} },
-	{ "rcyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_RCYCLEGROUP} },
+	{ "cyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_CYCLE} },
+	{ "rcyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_RCYCLE} },
 	{ "grouptoggle", kbfunc_client_grouptoggle, KBFLAG_NEEDCLIENT, {0}},
 	{ "maximize", kbfunc_client_maximize, KBFLAG_NEEDCLIENT, {0} },
 	{ "vmaximize", kbfunc_client_vmaximize, KBFLAG_NEEDCLIENT, {0} },