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

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

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.

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';

lisp/ChangeLog

@@ -1,5 +1,7 @@
 2011-11-24  Glenn Morris  <rgm@gnu.org>
 
+	* paths.el (rmail-file-name): Format doc-string for make-docfile.
+
 	* version.el (emacs-build-system): Give it a doc-string.
 
 2011-11-24  Juri Linkov  <juri@jurta.org>

lisp/paths.el

@@ -132,12 +132,8 @@ should be set to `(system-name)'.")
 *The name of your organization, as a string.
 The `ORGANIZATION' environment variable is used instead if defined.")
 
-;; This is a defcustom, which make-docfile does not recognize in
-;; uncompiled Lisp code.  If we use the "\ method of writing the doc,
-;; it does not get a doc string.  Somehow if we write it in the "wrong"
-;; (ie normal) way (as below), it does...  See also remote-shell-program.
-(defcustom rmail-file-name (purecopy "~/RMAIL")
-  "Name of user's primary mail file."
+(defcustom rmail-file-name (purecopy "~/RMAIL") "\
+Name of user's primary mail file."
   :type 'string
   :group 'rmail
   :version "21.1")