diff --git a/calmwm.c b/calmwm.c index 6a189d2..4a5f43d 100644 --- a/calmwm.c +++ b/calmwm.c @@ -102,7 +102,6 @@ main(int argc, char **argv) conf_path = NULL; } - conf_init(&Conf); if (conf_path && (parse_config(conf_path, &Conf) == -1)) warnx("config file %s has errors, not loading", conf_path); @@ -121,8 +120,7 @@ x_init(const char *dpyname) int i; if ((X_Dpy = XOpenDisplay(dpyname)) == NULL) - errx(1, "unable to open display \"%s\"", - XDisplayName(dpyname)); + errx(1, "unable to open display \"%s\"", XDisplayName(dpyname)); XSetErrorHandler(x_wmerrorhandler); XSelectInput(X_Dpy, DefaultRootWindow(X_Dpy), SubstructureRedirectMask); diff --git a/xevents.c b/xevents.c index 812e959..ddbd8b6 100644 --- a/xevents.c +++ b/xevents.c @@ -357,7 +357,7 @@ xev_handle_clientmessage(XEvent *ee) client_send_delete(cc); if (e->message_type == ewmh[_NET_ACTIVE_WINDOW].atom && - e->format == 32) { + e->format == 32) { old_cc = client_current(); if (old_cc) client_ptrsave(old_cc);