diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-21 10:51:02 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-21 10:51:02 -0800 |
| commit | 3870e8f9b973b1b9dd220c05345de7ed9dd7ff20 (patch) | |
| tree | ab690bc51048557556be0faa35d249c4d54f761a /lib-src | |
| parent | 0d7fdc0ef49f92c2ae20e13b172fc5ccc81f36f7 (diff) | |
| parent | 6ca1c3b4f26d01d3e9125986ca8e8f31eb1bf6bc (diff) | |
| download | emacs-3870e8f9b973b1b9dd220c05345de7ed9dd7ff20.tar.gz | |
Merge from mainline.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/make-docfile.c | 2 |
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 */ |