* lib-src/make-docfile.c (scan_lisp_file): Treat defcustom like defvar.

* lisp/paths.el (rmail-file-name): Format doc-string for make-docfile.

2 files changed, 7 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 983754eb1c3..5ff9b5bb6bc 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-24  Glenn Morris  <rgm@gnu.org>
+
+        * make-docfile.c (scan_lisp_file): Treat defcustom like defvar.
+
 2011-11-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * Makefile.in (all): Make sure "all" is the first target.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index ba54202954b..1ec365f3446 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1149,8 +1149,10 @@ scan_lisp_file (const char *filename, const char *mode)
             }
         }
 
+      /* defcustom can only occur in uncompiled Lisp files.  */
       else if (! strcmp (buffer, "defvar")
-               || ! strcmp (buffer, "defconst"))
+               || ! strcmp (buffer, "defconst")
+               || ! strcmp (buffer, "defcustom"))
         {
           char c1 = 0, c2 = 0;
           type = 'V';