[Emacs-diffs] /srv/bzr/emacs/trunk r106504: * lib-src/make-docfile.c (scan_lisp_file): Treat defcustom like defvar.

[Glenn Morris]

------------------------------------------------------------
revno: 106504
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-23 23:32:40 -0800
message:
  * lib-src/make-docfile.c (scan_lisp_file): Treat defcustom like defvar.
  
  * lisp/paths.el (rmail-file-name): Format doc-string for make-docfile.
modified:
  lib-src/ChangeLog
  lib-src/make-docfile.c
  lisp/ChangeLog
  lisp/paths.el

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-11-20 02:29:42 +0000
+++ b/lib-src/ChangeLog 2011-11-24 07:32:40 +0000
@@ -1,3 +1,7 @@
+2011-11-24  Glenn Morris  <address@hidden>
+
+       * make-docfile.c (scan_lisp_file): Treat defcustom like defvar.
+
 2011-11-14  Dan Nicolaescu  <address@hidden>
 
        * Makefile.in (all): Make sure "all" is the first target.

=== modified file 'lib-src/make-docfile.c'
--- a/lib-src/make-docfile.c    2011-05-28 22:39:39 +0000
+++ b/lib-src/make-docfile.c    2011-11-24 07:32:40 +0000
@@ -1149,8 +1149,10 @@
            }
        }
 
+      /* 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';

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-24 07:24:31 +0000
+++ b/lisp/ChangeLog    2011-11-24 07:32:40 +0000
@@ -1,5 +1,7 @@
 2011-11-24  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/paths.el'
--- a/lisp/paths.el     2011-11-23 08:48:07 +0000
+++ b/lisp/paths.el     2011-11-24 07:32:40 +0000
@@ -132,12 +132,8 @@
 *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")