I attach a patch to fix this.  The commit that introduced this regression showed that we weren't taking care of preserving the comments when redrawing either the custom-face or the custom-variable widget.