* custom.el (custom-declare-variable): Give clearer error message (bug#6476).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8639607abfd313868561165cd37ae4f499047cb..d7db00201cbf97342f803957a2831d5340fa8f7c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-23  Juanma Barranquero  <lekktu@gmail.com>
+
+       * custom.el (custom-declare-variable): Give a clearer error message
+       when the docstring is missing (bug#6476).
+
 2010-07-22  Michael R. Mauger  <mmaug@yahoo.com>
 
        * progmodes/sql.el: Version 2.4.  Improved Login prompting.

diff --git a/lisp/custom.el b/lisp/custom.el
index 726f70492b38c3cb9645a5647e63af3e6c164a0c..273c67dc66da2bcf7ce06601e4dc2d4f7d5229e5 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -143,7 +143,9 @@ set to nil, as the value is no longer rogue."
   (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)