(custom-group-value-create): Don't throw an error

when WIDGET has no doc-string.  (Bug#2356)

2 files changed, 12 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca9db4aa31f..e8221abc9df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-18  Martin Rudalics  <rudalics@gmx.at>
+
+        * cus-edit.el (custom-group-value-create): Don't throw an error
+        when WIDGET has no doc-string.  (Bug#2356)
+
 2009-02-18  Juanma Barranquero  <lekktu@gmail.com>
 
         * progmodes/cc-menus.el (imenu-progress-message):
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0de131f7a7f..3c2985a3b9b 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3877,7 +3877,8 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
          (symbol (widget-value widget))
          (members (custom-group-members symbol
                                         (and (eq custom-buffer-style 'tree)
-                                             custom-browse-only-groups))))
+                                             custom-browse-only-groups)))
+         (doc (widget-docstring widget)))
     (cond ((and (eq custom-buffer-style 'tree)
                 (eq state 'hidden)
                 (or members (custom-unloaded-widget-p widget)))
@@ -4005,8 +4006,8 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
            (let ((start (point)))
              (insert tag " group: ")
              (widget-specify-sample widget start (point)))
-           (if (< (length (widget-docstring widget)) 50)
-               (insert (widget-docstring widget)))
+           (when (and doc (< (length doc) 50))
+             (insert doc))
            ;; Create visibility indicator.
            (unless (eq custom-buffer-style 'links)
              (insert "--------")
@@ -4033,9 +4034,9 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
            ;; Update buttons.
            (widget-put widget :buttons buttons)
            ;; Insert documentation.
-           (if (>= (length (widget-docstring widget)) 50)
-               (widget-add-documentation-string-button
-                widget :visibility-widget 'custom-visibility))
+           (when (and doc (>= (length doc) 50))
+             (widget-add-documentation-string-button
+              widget :visibility-widget 'custom-visibility))
 
            ;; Parent groups.
            (if nil  ;;; This should test that the buffer