]> git.armaanb.net Git - dmenu.git/commitdiff
found compromise
authorarg@mig29 <unknown>
Thu, 7 Dec 2006 13:38:31 +0000 (14:38 +0100)
committerarg@mig29 <unknown>
Thu, 7 Dec 2006 13:38:31 +0000 (14:38 +0100)
dmenu.h
draw.c

diff --git a/dmenu.h b/dmenu.h
index 08d76056662b83bd73d6cfcfa31bd48df0a56f7c..ff9790d5b90024a55262181c2f81cf897c12b62f 100644 (file)
--- a/dmenu.h
+++ b/dmenu.h
@@ -4,7 +4,7 @@
 
 #include <X11/Xlib.h>
 
-#define FONT                   "fixed"
+#define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
 #define NORMBGCOLOR            "#333366"
 #define NORMFGCOLOR            "#cccccc"
 #define SELBGCOLOR             "#666699"
diff --git a/draw.c b/draw.c
index 62f6e2caf9cd16983d5cf0c8dc262f28d80521bc..bd11091e97d283f50ddd726538ad2d666b7e3de3 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -79,7 +79,7 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
-       char **missing, *def;
+       char *def, **missing;
        int i, n;
 
        missing = NULL;