aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--calmwm.c6
-rw-r--r--xevents.c4
2 files changed, 4 insertions, 6 deletions
diff --git a/calmwm.c b/calmwm.c
index 6a6d01b..4fc641d 100644
--- a/calmwm.c
+++ b/calmwm.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: calmwm.c,v 1.78 2013/06/17 17:11:10 okan Exp $
+ * $OpenBSD: calmwm.c,v 1.79 2013/07/08 15:46:16 okan Exp $
*/
#include <sys/param.h>
@@ -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 90eaee7..c222e3e 100644
--- a/xevents.c
+++ b/xevents.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: xevents.c,v 1.85 2013/06/10 21:37:30 okan Exp $
+ * $OpenBSD: xevents.c,v 1.86 2013/07/08 15:46:16 okan Exp $
*/
/*
@@ -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);