(customize-group): Handle groups not yet loaded.

(hook) [:value-to-internal]: Use a nil value unchanged.

1 files changed, 5 insertions, 3 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 501f757bcf4..0af690058aa 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -809,13 +809,15 @@ are shown; the contents of those subgroups are initially hidden."
                        (completing-read "Customize group: (default emacs) "
                                         obarray 
                                         (lambda (symbol)
-                                          (get symbol 'custom-group))
+                                          (or (get symbol 'custom-loads)
+                                              (get symbol 'custom-group)))
                                         t))))
-
   (when (stringp group)
     (if (string-equal "" group)
         (setq group 'emacs)
       (setq group (intern group))))
+  (or (get group 'custom-group)
+      (custom-load-symbol group))
   (let ((name (format "*Customize Group: %s*"
                       (custom-unlispify-tag-name group))))
     (if (get-buffer name)
@@ -2495,7 +2497,7 @@ Optional EVENT is the location for the menu."
 (define-widget 'hook 'list
   "A emacs lisp hook"
   :value-to-internal (lambda (widget value)
-                       (if (symbolp value)
+                       (if (and value (symbolp value))
                            (list value)
                          value))
   :match (lambda (widget value)