summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-11-23 23:32:40 -0800
committerGlenn Morris <rgm@gnu.org>2011-11-23 23:32:40 -0800
commit420b63ad29ddb217afc4a21b29f15c93df11d7d4 (patch)
tree5e7462bb2955cd6883f5c12b26f1b53c0e131c62 /lib-src
parentcb825e5d7b3f73eb393ba98ac25ed51597de6528 (diff)
downloademacs-420b63ad29ddb217afc4a21b29f15c93df11d7d4.tar.gz
* lib-src/make-docfile.c (scan_lisp_file): Treat defcustom like defvar.
* lisp/paths.el (rmail-file-name): Format doc-string for make-docfile.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/make-docfile.c4
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';