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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca9db4aa31f893baac4b9f5ebbeed73d54c10490..e8221abc9df2d2a7ac702190d52b7601a887a680 100644 (file)
--- 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 0de131f7a7f51a51c7ff99487c5a692d3bbf9527..3c2985a3b9b88f7fb11468c425d4a1343873ea19 100644 (file)
--- 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