X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=132743fa21014e43f26cda140826c1e5390477a2;hb=0f584636013cbb5fd6efef904857ac1695e72953;hp=16cb8b397f01c4284230ed27a87d59acb23e2b1c;hpb=a02a15fb5de22c4e8ea993e63cfcd093b19e997a;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 16cb8b3..132743f 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -7226,7 +7226,7 @@ int
 conf_load(const char *filename, int keymapping)
 {
 	FILE			*config;
-	char			*line = NULL, *cp, *optsub, *optval;
+	char			*line = NULL, *cp, *optsub, *optval = NULL;
 	size_t			linelen, lineno = 0;
 	int			wordlen, i, optidx;
 	struct config_option	*opt = NULL;
@@ -7246,8 +7246,8 @@ conf_load(const char *filename, int keymapping)
 		if (line)
 			free(line);
 
-		if ((line = fparseln(config, &linelen, &lineno, NULL, 0))
-		    == NULL) {
+		if ((line = fparseln(config, &linelen, &lineno, NULL,
+		    FPARSELN_UNESCCOMM | FPARSELN_UNESCCONT)) == NULL) {
 			if (ferror(config))
 				err(1, "%s", filename);
 			else
@@ -8209,7 +8209,7 @@ enternotify(xcb_enter_notify_event_t *e)
 			/* If no windows on pointer region, then focus root. */
 			r = root_to_region(e->root, SWM_CK_POINTER);
 			if (r == NULL) {
-				DNPRINTF(SWM_D_EVENT, "enterntoify: "
+				DNPRINTF(SWM_D_EVENT, "enternotify: "
 				    "NULL region; ignoring.\n");
 				return;
 			}
@@ -8224,7 +8224,7 @@ enternotify(xcb_enter_notify_event_t *e)
 		focus_win(get_focus_magic(win));
 	}
 
-	focus_flush();
+	xcb_flush(conn);
 }
 
 #ifdef SWM_DEBUG