diff lisp/custom.el @ 109871:3226ac2da7f7

merge from trunk

--- a/lisp/custom.el	Sat Jul 10 22:35:42 2010 +0200
+++ b/lisp/custom.el	Tue Aug 17 23:19:11 2010 +0200
@@ -143,7 +143,9 @@
   (when (get symbol 'force-value)
     (put symbol 'force-value nil))
   (when doc
-    (put symbol 'variable-documentation doc))
+    (if (keywordp doc)
+	(error "Doc string is missing")
+      (put symbol 'variable-documentation doc)))
   (let ((initialize 'custom-initialize-reset)
 	(requests nil))
     (unless (memq :group args)