# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1284824816 -3600
# Node ID d9e65b48e2bf8dc87623aacee247c933755a4ee6
# Parent  d804e621add0b33e60593fbe94da0e45945f895e
Correct the NEW_GC non-DEBUG_XEMACS version of PARSE_KEYWORDS().

2010-09-18  Aidan Kehoe  <kehoea@parhasard.net>

	* lisp.h (PARSE_KEYWORDS):
	Correct the NEW_GC non-DEBUG_XEMACS version of this macro; under
	such builds S##function is a pointer, not a Lisp_Subr structure.

diff -r d804e621add0 -r d9e65b48e2bf src/ChangeLog
--- a/src/ChangeLog	Sat Sep 18 15:57:20 2010 +0100
+++ b/src/ChangeLog	Sat Sep 18 16:46:56 2010 +0100
@@ -1,3 +1,9 @@
+2010-09-18  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lisp.h (PARSE_KEYWORDS):
+	Correct the NEW_GC non-DEBUG_XEMACS version of this macro; under
+	such builds S##function is a pointer, not a Lisp_Subr structure.
+
 2010-09-18  Aidan Kehoe  <kehoea@parhasard.net>
 
 	Simplify the API of PARSE_KEYWORDS for callers.
diff -r d804e621add0 -r d9e65b48e2bf src/lisp.h
--- a/src/lisp.h	Sat Sep 18 15:57:20 2010 +0100
+++ b/src/lisp.h	Sat Sep 18 16:46:56 2010 +0100
@@ -3554,6 +3554,12 @@
 				(intern_massaging_name (1 + #function))), \
 			  0);						\
 	assert (0 == strcmp (__func__, #function))
+#elsif defined (NEW_GC)
+#define PARSE_KEYWORDS(function, nargs, args, keyword_count, keywords,	\
+		       keyword_defaults)				\
+	PARSE_KEYWORDS_8 (intern (S##function->name), nargs, args,	\
+			  keyword_count, keywords,			\
+			  keyword_defaults, S##function->min_args, 0)
 #else
 #define PARSE_KEYWORDS(function, nargs, args, keyword_count, keywords,	\
 		       keyword_defaults)				\