# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1271648609 0
# Node ID 6daa7142a4783a7e949b3596d69c2130bcb6e720
# Parent  0f1b71b92989cc6bd0daa7b45208edac23f7d9fc# Parent  6eae3bc103308922a79cae2438d2eb905992433b
Merge from mainline.

diff -r 0f1b71b92989 -r 6daa7142a478 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 19 00:32:54 2010 +0000
+++ b/lisp/ChangeLog	Mon Apr 19 03:43:29 2010 +0000
@@ -1,3 +1,7 @@
+2010-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* custom.el (defcustom): Add edebug spec.
+
 2010-04-18  Juri Linkov  <juri@jurta.org>
 
 	Test for special mode-class in view-buffer instead of view-file (bug#5513).
diff -r 0f1b71b92989 -r 6daa7142a478 lisp/custom.el
--- a/lisp/custom.el	Mon Apr 19 00:32:54 2010 +0000
+++ b/lisp/custom.el	Mon Apr 19 03:43:29 2010 +0000
@@ -304,7 +304,7 @@
 
 See Info node `(elisp) Customization' in the Emacs Lisp manual
 for more information."
-  (declare (doc-string 3))
+  (declare (doc-string 3) (debug (name body)))
   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.