diff lib-src/make-docfile.c @ 109351:c8a969d13eda

merge trunk

--- a/lib-src/make-docfile.c	Thu Jul 08 17:09:35 2010 +0900
+++ b/lib-src/make-docfile.c	Fri Jul 09 15:55:27 2010 +0900
@@ -450,9 +450,24 @@
 
   for (p = buf; *p; p++)
     {
-      char c = *p;
+      char c;
       int ident_start = 0;
 
+      /* FIXME: this must be made a bit more robust*/
+      
+      /* Skip "register Lisp_Object", this can be removed when we get
+	 rid of "register" for DEFUNs. */
+      if (strncmp ("register Lisp_Object", p, 20) == 0)
+	p += 20;
+
+      if (strncmp ("Lisp_Object", p, 11) == 0)
+	p += 11;
+
+      if (strncmp ("void", p, 4) == 0)
+	p += 4;
+
+      c  = *p;
+      
       /* Notice when we start printing a new identifier.  */
       if ((('A' <= c && c <= 'Z')
 	   || ('a' <= c && c <= 'z')