* make-docfile.c (scan_c_file): Since DEFVAR_PER_BUFFER now takes

	a different number of arguments than other DEFVARs, recognize it
	specially, and expect the right number of commas.

1 files changed, 17 insertions, 0 deletions

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 3b5d3a16052..83602f86e8a 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -200,6 +200,7 @@ scan_c_file (filename)
   register int c;
   register int commas;
   register int defunflag;
+  register int defvarperbufferflag;
   register int defvarflag;
   int minargs, maxargs;
 
@@ -239,8 +240,22 @@ scan_c_file (filename)
           c = getc (infile);
           if (c != 'V')
             continue;
+          c = getc (infile);
+          if (c != 'A')
+            continue;
+          c = getc (infile);
+          if (c != 'R')
+            continue;
+          c = getc (infile);
+          if (c != '_')
+            continue;
+
           defvarflag = 1;
           defunflag = 0;
+
+          c = getc (infile);
+          defvarperbufferflag = (c == 'P');
+
           c = getc (infile);
         }
       else if (c == 'D')
@@ -271,6 +286,8 @@ scan_c_file (filename)
 
       if (defunflag)
         commas = 5;
+      else if (defvarperbufferflag)
+        commas = 2;
       else if (defvarflag)
         commas = 1;
       else  /* For DEFSIMPLE and DEFPRED */