From 25ea77ee209bbacab0d07e5fb01e9d64917158f1 Mon Sep 17 00:00:00 2001
From: Neil Jerram <address@hidden>
Date: Mon, 27 Oct 2008 23:42:02 +0000
Subject: [PATCH] Fix elisp apply error (list ending with nil)

---
 libguile.h             |    1 +
 libguile/vm-engine.h   |    2 +-
 libguile/vm-i-system.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libguile.h b/libguile.h
index 40122df..d28df69 100644
--- a/libguile.h
+++ b/libguile.h
@@ -58,6 +58,7 @@ extern "C" {
 #include "libguile/rdelim.h"
 #include "libguile/rw.h"
 #include "libguile/keywords.h"
+#include "libguile/lang.h"
 #include "libguile/list.h"
 #include "libguile/load.h"
 #include "libguile/macros.h"
diff --git a/libguile/vm-engine.h b/libguile/vm-engine.h
index 215f630..b6748e1 100644
--- a/libguile/vm-engine.h
+++ b/libguile/vm-engine.h
@@ -305,7 +305,7 @@ do						\
 {						\
   for (; scm_is_pair (l); l = SCM_CDR (l))      \
     PUSH (SCM_CAR (l));                         \
-  if (SCM_UNLIKELY (!SCM_NULLP (l))) {          \
+  if (SCM_UNLIKELY (!SCM_NULL_OR_NIL_P (l))) {  \
     err_args = scm_list_1 (l);                  \
     goto vm_error_improper_list;                \
   }                                             \
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index 2da2d42..4a7e439 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -39,7 +39,7 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
 
-/* This file is included in vm_engine.c */
+/* This file is included in vm-engine.c */
 
 
 /*
-- 
1.5.6