Merge from mainline.

2 files changed, 6 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 53983a9decc..042982aecbf 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -14,6 +14,11 @@
         Declare non-'main' functions and variables to be static.
         * ebrowse.c: Omit redundant function prototypes.
 
+2011-02-21  Ben Key  <bkey76@gmail.com>  (tiny change)
+
+        * make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to
+        the new BVAR macro.
+
 2011-02-20  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (obj): Remove md5.o.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 4dd6e8efb14..956e85f163a 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -815,7 +815,7 @@ scan_c_file (char *filename, const char *mode)
       if (defunflag)
         commas = 5;
       else if (defvarperbufferflag)
-        commas = 2;
+        commas = 3;
       else if (defvarflag)
         commas = 1;
       else  /* For DEFSIMPLE and DEFPRED */