From: Connor Lane Smith <cls@lubutu.com>
Date: Mon, 19 Sep 2011 23:11:01 +0000 (+0100)
Subject: merge token -> default
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=50207344084b385839cef251f77f5129dc85874e;p=dmenu.git

merge token -> default
---

50207344084b385839cef251f77f5129dc85874e
diff --cc dmenu.c
index 6c1407d,1cd9f61..9d479f9
--- a/dmenu.c
+++ b/dmenu.c
@@@ -519,12 -525,12 +530,12 @@@ setup(void) 
  	}
  	promptw = prompt ? textw(dc, prompt) : 0;
  	inputw = MIN(inputw, mw/3);
- 	match(False);
+ 	match();
  
  	/* menu window */
 -	wa.override_redirect = True;
 -	wa.background_pixmap = ParentRelative;
 -	wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
 +	swa.override_redirect = True;
 +	swa.background_pixmap = ParentRelative;
 +	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
  	win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
  	                    DefaultDepth(dc->dpy, screen), CopyFromParent,
  	                    DefaultVisual(dc->dpy, screen),