aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/lib/fnct_key.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 69f49ec6..05e121b9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
2011-06-15 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * lib/fnct_key.c (handle_function_key): Explicitly cast the
+ null pointer sentinel to a pointer type.
+
+2011-06-15 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* sman/sman.c: utils.h no longer exists.
2011-06-11 Gabriel Dos Reis <gdr@cs.tamu.edu>
diff --git a/src/lib/fnct_key.c b/src/lib/fnct_key.c
index 69498ec0..09083999 100644
--- a/src/lib/fnct_key.c
+++ b/src/lib/fnct_key.c
@@ -313,7 +313,7 @@ handle_function_key(int key,int chann)
case 0:
execlp((function_key[12]).str,
(function_key[12]).str,
- editorfilename, NULL);
+ editorfilename, (char*) NULL);
perror("Returned from exec");
exit(0);