Fix various issues (compile warnings etc.)

The fixes include:
 * Add missing return values for some functions,
 * Initialize some variables
 * Fix data declaration to match struct's definition
 * Appropriate casting where needed
 * Forward declaration for some functions

13 files changed, 194 insertions, 185 deletions

diff --git a/src/ansi.c b/src/ansi.c
index 6a64095..d88e153 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -1365,7 +1365,7 @@ int c, intermediate;
 		    break;
 # endif
 		  curr->w_charsets[0] = curr->w_charsets[1] =
-		    curr->w_charsets[2] = curr->w_charsets[2] =
+		    curr->w_charsets[2] = curr->w_charsets[3] =
 		    curr->w_FontL = curr->w_FontR = ASCII;
 		  curr->w_Charset = 0;
 		  curr->w_CharsetR = 2;
diff --git a/src/configure.in b/src/configure.in
index 4184947..e9ca223 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -288,7 +288,8 @@ dnl execvpe
 AC_CHECKING(execvpe)
 AC_TRY_LINK(,[
     execvpe(0, 0, 0);
-], AC_DEFINE(HAVE_EXECVPE))
+], AC_DEFINE(HAVE_EXECVPE)
+CFLAGS="$CFLAGS -D_GNU_SOURCE")
 
 dnl
 dnl    ****  select()  ****
diff --git a/src/display.c b/src/display.c
index 5fa11cb..94c05f1 100644
--- a/src/display.c
+++ b/src/display.c
@@ -51,7 +51,6 @@ static void disp_writeev_eagain __P((struct event *, char *));
 static void disp_status_fn __P((struct event *, char *));
 static void disp_hstatus_fn __P((struct event *, char *));
 static void disp_blocked_fn __P((struct event *, char *));
-static void cv_winid_fn __P((struct event *, char *));
 #ifdef MAPKEYS
 static void disp_map_fn __P((struct event *, char *));
 #endif
@@ -2123,7 +2122,6 @@ static int
 strlen_onscreen(unsigned char *c, unsigned char *end)
 {
   int len = 0;
-  char *s = c;
   while (*c && (!end || c < end))
     {
       int v, dec = 0;
@@ -2155,7 +2153,7 @@ int start, max;
      probably take way more time. So this will have to do for now. */
   if (D_encoding == UTF8)
     {
-      int chars = strlen_onscreen(s + start, s + max);
+      int chars = strlen_onscreen((unsigned char *)(s + start), (unsigned char *)(s + max));
       D_encoding = 0;
       PutWinMsg(s, start, max);
       D_encoding = UTF8;
diff --git a/src/extern.h b/src/extern.h
index 2b9722e..b8cead4 100644
--- a/src/extern.h
+++ b/src/extern.h
@@ -344,6 +344,7 @@ extern void  ReceiveMsg __P((void));
 extern void  SendCreateMsg __P((char *, struct NewWindow *));
 extern int   SendErrorMsg __P((char *, char *));
 extern int   SendAttachMsg __P((int, struct msg *, int));
+extern void  ReceiveRaw __P((int));
 
 /* misc.c */
 extern char *SaveStr __P((const char *));
@@ -452,6 +453,8 @@ extern void  LMsg __P(());
 extern void  KillLayerChain __P((struct layer *));
 extern int   InitOverlayPage __P((int, struct LayFuncs *, int));
 extern void  ExitOverlayPage __P((void));
+extern int   LayProcessMouse __P((struct layer *, unsigned char));
+extern void  LayProcessMouseSwitch __P((struct layer *, int));
 
 /* teln.c */
 #ifdef BUILTIN_TELNET
diff --git a/src/layer.c b/src/layer.c
index aeea318..1ae7972 100644
--- a/src/layer.c
+++ b/src/layer.c
@@ -1197,7 +1197,7 @@ LayProcessMouse(struct layer *l, unsigned char ch)
   return (l->l_mouseevent.len == sizeof(l->l_mouseevent.buffer));
 }
 
-int
+void
 LayProcessMouseSwitch(struct layer *l, int s)
 {
   if ((l->l_mouseevent.start = s))
diff --git a/src/layout.h b/src/layout.h
index 1814226..5f190bd 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -52,6 +52,9 @@ extern void  SaveLayout __P((char *, struct canvas *));
 extern void  ShowLayouts __P((int));
 extern struct layout *FindLayout __P((char *));
 extern void  UpdateLayoutCanvas __P((struct canvas *, struct win *));
+extern struct layout *CreateLayout __P((char *, int));
+extern void  RemoveLayout __P((struct layout *));
+extern int   LayoutDumpCanvas __P((struct canvas *, char *));
 
 extern void RenameLayout __P((struct layout *, const char *));
 extern int RenumberLayout __P((struct layout *, int));
diff --git a/src/list_display.c b/src/list_display.c
index 4e740c1..113bc1c 100644
--- a/src/list_display.c
+++ b/src/list_display.c
@@ -34,6 +34,7 @@
 #include "config.h"
 
 #include "screen.h"
+#include "extern.h"
 #include "list_generic.h"
 
 #ifdef MULTI
@@ -77,6 +78,7 @@ static int
 gl_Display_footer(struct ListData *ldata)
 {
   centerline("[Press Space to refresh; Return to end.]", flayer->l_height - 1);
+  return 1;
 }
 
 static int
diff --git a/src/list_window.c b/src/list_window.c
index 4fd65d0..2242de9 100644
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -306,7 +306,7 @@ gl_Window_input(struct ListData *ldata, char **inp, int *len)
 	break;
 #ifdef MULTIUSER
       if (display && AclCheckPermWin(D_user, ACL_READ, win))
-	return;		/* Not allowed to switch to this window. */
+	return 0;		/* Not allowed to switch to this window. */
 #endif
       if (WLIST_FOR_GROUP(wdata))
 	SwitchWindow(win->w_number);
diff --git a/src/mark.c b/src/mark.c
index 35c2178..80c605f 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -158,6 +158,7 @@ nextchar(int *xp, int *yp, int direction, char target, int num)
   debug("nextchar\n");
  
   x = *xp;
+  step = 1;
   adjust = 0;
   width = fore->w_width;
   displayed_line = (char *)WIN(*yp) -> image;
diff --git a/src/process.c b/src/process.c
index dfa7c82..70e59f3 100644
--- a/src/process.c
+++ b/src/process.c
@@ -250,177 +250,177 @@ struct digraph
 
 /* digraph table taken from old vim and rfc1345 */
 static struct digraph digraphs[MAX_DIGRAPH + 1] = {
-    {' ', ' ', 160},	/*   */
-    {'N', 'S', 160},	/*   */
-    {'~', '!', 161},	/* ¡ */
-    {'!', '!', 161},	/* ¡ */
-    {'!', 'I', 161},	/* ¡ */
-    {'c', '|', 162},	/* ¢ */
-    {'c', 't', 162},	/* ¢ */
-    {'$', '$', 163},	/* £ */
-    {'P', 'd', 163},	/* £ */
-    {'o', 'x', 164},	/* ¤ */
-    {'C', 'u', 164},	/* ¤ */
-    {'C', 'u', 164},	/* ¤ */
-    {'E', 'u', 164},	/* ¤ */
-    {'Y', '-', 165},	/* ¥ */
-    {'Y', 'e', 165},	/* ¥ */
-    {'|', '|', 166},	/* ¦ */
-    {'B', 'B', 166},	/* ¦ */
-    {'p', 'a', 167},	/* § */
-    {'S', 'E', 167},	/* § */
-    {'"', '"', 168},	/* ¨ */
-    {'\'', ':', 168},	/* ¨ */
-    {'c', 'O', 169},	/* © */
-    {'C', 'o', 169},	/* © */
-    {'a', '-', 170},	/* ª */
-    {'<', '<', 171},	/* « */
-    {'-', ',', 172},	/* ¬ */
-    {'N', 'O', 172},	/* ¬ */
-    {'-', '-', 173},	/* ­ */
-    {'r', 'O', 174},	/* ® */
-    {'R', 'g', 174},	/* ® */
-    {'-', '=', 175},	/* ¯ */
-    {'\'', 'm', 175},	/* ¯ */
-    {'~', 'o', 176},	/* ° */
-    {'D', 'G', 176},	/* ° */
-    {'+', '-', 177},	/* ± */
-    {'2', '2', 178},	/* ² */
-    {'2', 'S', 178},	/* ² */
-    {'3', '3', 179},	/* ³ */
-    {'3', 'S', 179},	/* ³ */
-    {'\'', '\'', 180},	/* ´ */
-    {'j', 'u', 181},	/* µ */
-    {'M', 'y', 181},	/* µ */
-    {'p', 'p', 182},	/* ¶ */
-    {'P', 'I', 182},	/* ¶ */
-    {'~', '.', 183},	/* · */
-    {'.', 'M', 183},	/* · */
-    {',', ',', 184},	/* ¸ */
-    {'\'', ',', 184},	/* ¸ */
-    {'1', '1', 185},	/* ¹ */
-    {'1', 'S', 185},	/* ¹ */
-    {'o', '-', 186},	/* º */
-    {'>', '>', 187},	/* » */
-    {'1', '4', 188},	/* ¼ */
-    {'1', '2', 189},	/* ½ */
-    {'3', '4', 190},	/* ¾ */
-    {'~', '?', 191},	/* ¿ */
-    {'?', '?', 191},	/* ¿ */
-    {'?', 'I', 191},	/* ¿ */
-    {'A', '`', 192},	/* À */
-    {'A', '!', 192},	/* À */
-    {'A', '\'', 193},	/* Á */
-    {'A', '^', 194},	/* Â */
-    {'A', '>', 194},	/* Â */
-    {'A', '~', 195},	/* Ã */
-    {'A', '?', 195},	/* Ã */
-    {'A', '"', 196},	/* Ä */
-    {'A', ':', 196},	/* Ä */
-    {'A', '@', 197},	/* Å */
-    {'A', 'A', 197},	/* Å */
-    {'A', 'E', 198},	/* Æ */
-    {'C', ',', 199},	/* Ç */
-    {'E', '`', 200},	/* È */
-    {'E', '!', 200},	/* È */
-    {'E', '\'', 201},	/* É */
-    {'E', '^', 202},	/* Ê */
-    {'E', '>', 202},	/* Ê */
-    {'E', '"', 203},	/* Ë */
-    {'E', ':', 203},	/* Ë */
-    {'I', '`', 204},	/* Ì */
-    {'I', '!', 204},	/* Ì */
-    {'I', '\'', 205},	/* Í */
-    {'I', '^', 206},	/* Î */
-    {'I', '>', 206},	/* Î */
-    {'I', '"', 207},	/* Ï */
-    {'I', ':', 207},	/* Ï */
-    {'D', '-', 208},	/* Ð */
-    {'N', '~', 209},	/* Ñ */
-    {'N', '?', 209},	/* Ñ */
-    {'O', '`', 210},	/* Ò */
-    {'O', '!', 210},	/* Ò */
-    {'O', '\'', 211},	/* Ó */
-    {'O', '^', 212},	/* Ô */
-    {'O', '>', 212},	/* Ô */
-    {'O', '~', 213},	/* Õ */
-    {'O', '?', 213},	/* Õ */
-    {'O', '"', 214},	/* Ö */
-    {'O', ':', 214},	/* Ö */
-    {'/', '\\', 215},	/* × */
-    {'*', 'x', 215},	/* × */
-    {'O', '/', 216},	/* Ø */
-    {'U', '`', 217},	/* Ù */
-    {'U', '!', 217},	/* Ù */
-    {'U', '\'', 218},	/* Ú */
-    {'U', '^', 219},	/* Û */
-    {'U', '>', 219},	/* Û */
-    {'U', '"', 220},	/* Ü */
-    {'U', ':', 220},	/* Ü */
-    {'Y', '\'', 221},	/* Ý */
-    {'I', 'p', 222},	/* Þ */
-    {'T', 'H', 222},	/* Þ */
-    {'s', 's', 223},	/* ß */
-    {'s', '"', 223},	/* ß */
-    {'a', '`', 224},	/* à */
-    {'a', '!', 224},	/* à */
-    {'a', '\'', 225},	/* á */
-    {'a', '^', 226},	/* â */
-    {'a', '>', 226},	/* â */
-    {'a', '~', 227},	/* ã */
-    {'a', '?', 227},	/* ã */
-    {'a', '"', 228},	/* ä */
-    {'a', ':', 228},	/* ä */
-    {'a', 'a', 229},	/* å */
-    {'a', 'e', 230},	/* æ */
-    {'c', ',', 231},	/* ç */
-    {'e', '`', 232},	/* è */
-    {'e', '!', 232},	/* è */
-    {'e', '\'', 233},	/* é */
-    {'e', '^', 234},	/* ê */
-    {'e', '>', 234},	/* ê */
-    {'e', '"', 235},	/* ë */
-    {'e', ':', 235},	/* ë */
-    {'i', '`', 236},	/* ì */
-    {'i', '!', 236},	/* ì */
-    {'i', '\'', 237},	/* í */
-    {'i', '^', 238},	/* î */
-    {'i', '>', 238},	/* î */
-    {'i', '"', 239},	/* ï */
-    {'i', ':', 239},	/* ï */
-    {'d', '-', 240},	/* ð */
-    {'n', '~', 241},	/* ñ */
-    {'n', '?', 241},	/* ñ */
-    {'o', '`', 242},	/* ò */
-    {'o', '!', 242},	/* ò */
-    {'o', '\'', 243},	/* ó */
-    {'o', '^', 244},	/* ô */
-    {'o', '>', 244},	/* ô */
-    {'o', '~', 245},	/* õ */
-    {'o', '?', 245},	/* õ */
-    {'o', '"', 246},	/* ö */
-    {'o', ':', 246},	/* ö */
-    {':', '-', 247},	/* ÷ */
-    {'o', '/', 248},	/* ø */
-    {'u', '`', 249},	/* ù */
-    {'u', '!', 249},	/* ù */
-    {'u', '\'', 250},	/* ú */
-    {'u', '^', 251},	/* û */
-    {'u', '>', 251},	/* û */
-    {'u', '"', 252},	/* ü */
-    {'u', ':', 252},	/* ü */
-    {'y', '\'', 253},	/* ý */
-    {'i', 'p', 254},	/* þ */
-    {'t', 'h', 254},	/* þ */
-    {'y', '"', 255},	/* ÿ */
-    {'y', ':', 255},	/* ÿ */
-    {'"', '[', 196},	/* Ä */
-    {'"', '\\', 214},	/* Ö */
-    {'"', ']', 220},	/* Ü */
-    {'"', '{', 228},	/* ä */
-    {'"', '|', 246},	/* ö */
-    {'"', '}', 252},	/* ü */
-    {'"', '~', 223}	/* ß */
+    {{' ', ' '}, 160},	/*   */
+    {{'N', 'S'}, 160},	/*   */
+    {{'~', '!'}, 161},	/* ¡ */
+    {{'!', '!'}, 161},	/* ¡ */
+    {{'!', 'I'}, 161},	/* ¡ */
+    {{'c', '|'}, 162},	/* ¢ */
+    {{'c', 't'}, 162},	/* ¢ */
+    {{'$', '$'}, 163},	/* £ */
+    {{'P', 'd'}, 163},	/* £ */
+    {{'o', 'x'}, 164},	/* ¤ */
+    {{'C', 'u'}, 164},	/* ¤ */
+    {{'C', 'u'}, 164},	/* ¤ */
+    {{'E', 'u'}, 164},	/* ¤ */
+    {{'Y', '-'}, 165},	/* ¥ */
+    {{'Y', 'e'}, 165},	/* ¥ */
+    {{'|', '|'}, 166},	/* ¦ */
+    {{'B', 'B'}, 166},	/* ¦ */
+    {{'p', 'a'}, 167},	/* § */
+    {{'S', 'E'}, 167},	/* § */
+    {{'"', '"'}, 168},	/* ¨ */
+    {{'\'', ':'}, 168},	/* ¨ */
+    {{'c', 'O'}, 169},	/* © */
+    {{'C', 'o'}, 169},	/* © */
+    {{'a', '-'}, 170},	/* ª */
+    {{'<', '<'}, 171},	/* « */
+    {{'-', ','}, 172},	/* ¬ */
+    {{'N', 'O'}, 172},	/* ¬ */
+    {{'-', '-'}, 173},	/* ­ */
+    {{'r', 'O'}, 174},	/* ® */
+    {{'R', 'g'}, 174},	/* ® */
+    {{'-', '='}, 175},	/* ¯ */
+    {{'\'', 'm'}, 175},	/* ¯ */
+    {{'~', 'o'}, 176},	/* ° */
+    {{'D', 'G'}, 176},	/* ° */
+    {{'+', '-'}, 177},	/* ± */
+    {{'2', '2'}, 178},	/* ² */
+    {{'2', 'S'}, 178},	/* ² */
+    {{'3', '3'}, 179},	/* ³ */
+    {{'3', 'S'}, 179},	/* ³ */
+    {{'\'', '\''}, 180},	/* ´ */
+    {{'j', 'u'}, 181},	/* µ */
+    {{'M', 'y'}, 181},	/* µ */
+    {{'p', 'p'}, 182},	/* ¶ */
+    {{'P', 'I'}, 182},	/* ¶ */
+    {{'~', '.'}, 183},	/* · */
+    {{'.', 'M'}, 183},	/* · */
+    {{',', ','}, 184},	/* ¸ */
+    {{'\'', ','}, 184},	/* ¸ */
+    {{'1', '1'}, 185},	/* ¹ */
+    {{'1', 'S'}, 185},	/* ¹ */
+    {{'o', '-'}, 186},	/* º */
+    {{'>', '>'}, 187},	/* » */
+    {{'1', '4'}, 188},	/* ¼ */
+    {{'1', '2'}, 189},	/* ½ */
+    {{'3', '4'}, 190},	/* ¾ */
+    {{'~', '?'}, 191},	/* ¿ */
+    {{'?', '?'}, 191},	/* ¿ */
+    {{'?', 'I'}, 191},	/* ¿ */
+    {{'A', '`'}, 192},	/* À */
+    {{'A', '!'}, 192},	/* À */
+    {{'A', '\''}, 193},	/* Á */
+    {{'A', '^'}, 194},	/* Â */
+    {{'A', '>'}, 194},	/* Â */
+    {{'A', '~'}, 195},	/* Ã */
+    {{'A', '?'}, 195},	/* Ã */
+    {{'A', '"'}, 196},	/* Ä */
+    {{'A', ':'}, 196},	/* Ä */
+    {{'A', '@'}, 197},	/* Å */
+    {{'A', 'A'}, 197},	/* Å */
+    {{'A', 'E'}, 198},	/* Æ */
+    {{'C', ','}, 199},	/* Ç */
+    {{'E', '`'}, 200},	/* È */
+    {{'E', '!'}, 200},	/* È */
+    {{'E', '\''}, 201},	/* É */
+    {{'E', '^'}, 202},	/* Ê */
+    {{'E', '>'}, 202},	/* Ê */
+    {{'E', '"'}, 203},	/* Ë */
+    {{'E', ':'}, 203},	/* Ë */
+    {{'I', '`'}, 204},	/* Ì */
+    {{'I', '!'}, 204},	/* Ì */
+    {{'I', '\''}, 205},	/* Í */
+    {{'I', '^'}, 206},	/* Î */
+    {{'I', '>'}, 206},	/* Î */
+    {{'I', '"'}, 207},	/* Ï */
+    {{'I', ':'}, 207},	/* Ï */
+    {{'D', '-'}, 208},	/* Ð */
+    {{'N', '~'}, 209},	/* Ñ */
+    {{'N', '?'}, 209},	/* Ñ */
+    {{'O', '`'}, 210},	/* Ò */
+    {{'O', '!'}, 210},	/* Ò */
+    {{'O', '\''}, 211},	/* Ó */
+    {{'O', '^'}, 212},	/* Ô */
+    {{'O', '>'}, 212},	/* Ô */
+    {{'O', '~'}, 213},	/* Õ */
+    {{'O', '?'}, 213},	/* Õ */
+    {{'O', '"'}, 214},	/* Ö */
+    {{'O', ':'}, 214},	/* Ö */
+    {{'/', '\\'}, 215},	/* × */
+    {{'*', 'x'}, 215},	/* × */
+    {{'O', '/'}, 216},	/* Ø */
+    {{'U', '`'}, 217},	/* Ù */
+    {{'U', '!'}, 217},	/* Ù */
+    {{'U', '\''}, 218},	/* Ú */
+    {{'U', '^'}, 219},	/* Û */
+    {{'U', '>'}, 219},	/* Û */
+    {{'U', '"'}, 220},	/* Ü */
+    {{'U', ':'}, 220},	/* Ü */
+    {{'Y', '\''}, 221},	/* Ý */
+    {{'I', 'p'}, 222},	/* Þ */
+    {{'T', 'H'}, 222},	/* Þ */
+    {{'s', 's'}, 223},	/* ß */
+    {{'s', '"'}, 223},	/* ß */
+    {{'a', '`'}, 224},	/* à */
+    {{'a', '!'}, 224},	/* à */
+    {{'a', '\''}, 225},	/* á */
+    {{'a', '^'}, 226},	/* â */
+    {{'a', '>'}, 226},	/* â */
+    {{'a', '~'}, 227},	/* ã */
+    {{'a', '?'}, 227},	/* ã */
+    {{'a', '"'}, 228},	/* ä */
+    {{'a', ':'}, 228},	/* ä */
+    {{'a', 'a'}, 229},	/* å */
+    {{'a', 'e'}, 230},	/* æ */
+    {{'c', ','}, 231},	/* ç */
+    {{'e', '`'}, 232},	/* è */
+    {{'e', '!'}, 232},	/* è */
+    {{'e', '\''}, 233},	/* é */
+    {{'e', '^'}, 234},	/* ê */
+    {{'e', '>'}, 234},	/* ê */
+    {{'e', '"'}, 235},	/* ë */
+    {{'e', ':'}, 235},	/* ë */
+    {{'i', '`'}, 236},	/* ì */
+    {{'i', '!'}, 236},	/* ì */
+    {{'i', '\''}, 237},	/* í */
+    {{'i', '^'}, 238},	/* î */
+    {{'i', '>'}, 238},	/* î */
+    {{'i', '"'}, 239},	/* ï */
+    {{'i', ':'}, 239},	/* ï */
+    {{'d', '-'}, 240},	/* ð */
+    {{'n', '~'}, 241},	/* ñ */
+    {{'n', '?'}, 241},	/* ñ */
+    {{'o', '`'}, 242},	/* ò */
+    {{'o', '!'}, 242},	/* ò */
+    {{'o', '\''}, 243},	/* ó */
+    {{'o', '^'}, 244},	/* ô */
+    {{'o', '>'}, 244},	/* ô */
+    {{'o', '~'}, 245},	/* õ */
+    {{'o', '?'}, 245},	/* õ */
+    {{'o', '"'}, 246},	/* ö */
+    {{'o', ':'}, 246},	/* ö */
+    {{':', '-'}, 247},	/* ÷ */
+    {{'o', '/'}, 248},	/* ø */
+    {{'u', '`'}, 249},	/* ù */
+    {{'u', '!'}, 249},	/* ù */
+    {{'u', '\''}, 250},	/* ú */
+    {{'u', '^'}, 251},	/* û */
+    {{'u', '>'}, 251},	/* û */
+    {{'u', '"'}, 252},	/* ü */
+    {{'u', ':'}, 252},	/* ü */
+    {{'y', '\''}, 253},	/* ý */
+    {{'i', 'p'}, 254},	/* þ */
+    {{'t', 'h'}, 254},	/* þ */
+    {{'y', '"'}, 255},	/* ÿ */
+    {{'y', ':'}, 255},	/* ÿ */
+    {{'"', '['}, 196},	/* Ä */
+    {{'"', '\\'}, 214},	/* Ö */
+    {{'"', ']'}, 220},	/* Ü */
+    {{'"', '{'}, 228},	/* ä */
+    {{'"', '|'}, 246},	/* ö */
+    {{'"', '}'}, 252},	/* ü */
+    {{'"', '~'}, 223}	/* ß */
 };
 
 #define RESIZE_FLAG_H 1
@@ -1154,7 +1154,6 @@ int key;
   char ch;
   struct display *odisplay = display;
   struct acluser *user;
-  struct layout *layout;
 
   user = display ? D_user : users;
   if (nr == RC_ILLEGAL)
@@ -3302,7 +3301,7 @@ int key;
           int newnr, fl = 0, kf = 0, af = 0, df = 0, mf = 0;
 	  struct display *odisp = display;
 	  int used = 0;
-          struct kmap_ext *kme;
+          struct kmap_ext *kme = NULL;
 
 	  for (; *args && **args == '-'; args++, argl++)
 	    {
@@ -3770,7 +3769,7 @@ int key;
 		  else
 		    {
 		      int t;
-		      unsigned char *s = args[1];
+		      unsigned char *s = (unsigned char *)args[1];
 		      digraphs[i].value = 0;
 		      while (*s)
 			{
diff --git a/src/resize.c b/src/resize.c
index 7516751..ec4742e 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -326,7 +326,7 @@ kaablamm()
 /* Kills non-resizable layers. */
 #define RESIZE_OR_KILL_LAYERS(l, wi, he) do \
   {	\
-    struct layer *_last = NULL, *_iter;	\
+    struct layer *_last = NULL;	\
     flayer = (l);	\
     while (flayer->l_next)	\
       {	\
diff --git a/src/screen.c b/src/screen.c
index 3dde3b4..b3c85d4 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -819,8 +819,8 @@ char **av;
           char *newbuf = malloc(3 * len);
           if (!newbuf)
             Panic(0, "%s", strnomem);
-          newsz = RecodeBuf(nwin_options.aka, len,
-                            nwin_options.encoding, 0, newbuf);
+          newsz = RecodeBuf((unsigned char *)nwin_options.aka, len,
+                            nwin_options.encoding, 0, (unsigned char *)newbuf);
           newbuf[newsz] = '\0';
           nwin_options.aka = newbuf;
         }
@@ -2517,7 +2517,7 @@ int rec;
   int truncpos = -1;
   int truncper = 0;
   int trunclong = 0;
-  struct backtick *bt;
+  struct backtick *bt = NULL;
  
   if (winmsg_numrend >= 0)
     winmsg_numrend = 0;
diff --git a/src/window.c b/src/window.c
index 8509b7d..1c6f5b6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -112,7 +112,9 @@ struct win **wtab;	/* window table */
 int VerboseCreate = 0;		/* XXX move this to user.h */
 
 char DefaultShell[] = "/bin/sh";
+#ifndef HAVE_EXECVPE
 static char DefaultPath[] = ":/usr/ucb:/bin:/usr/bin";
+#endif
 
 /* keep this in sync with the structure definition in window.h */
 struct NewWindow nwin_undef   =