Merge remote-tracking branch 'origin/master' into feature/android

2 files changed, 1 insertions, 4 deletions

diff --git a/admin/admin.el b/admin/admin.el
index 90f810b79c6..1f4c6986b0e 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1038,8 +1038,7 @@ If optional argument OLD is non-nil, also scan for `defvar's."
                   (and grp
                        (setq grp (car (cdr-safe grp))) ; (quote foo) -> foo
                        (setq ver (assq grp glist))))
-                (setq alist (cons (cons var ver) alist))))
-          (if form (format-message "Malformed defcustom: `%s'" form)))))
+                (setq alist (cons (cons var ver) alist)))))))
     (message "%sdone" m)
     alist))
 
diff --git a/admin/cus-test.el b/admin/cus-test.el
index f07019bb52c..c833ddacd84 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -221,8 +221,6 @@ The detected problematic options are stored in `cus-test-errors'."
 
            ;; Check the values
            (mapc (lambda (value)
-                   ;; TODO for booleans, check for values that can be
-                   ;; evaluated and are not t or nil.  Usually a bug.
                    (unless (widget-apply conv :match value)
                      (let ((err (list symbol :type-error value type)))
                        (unless (member err cus-test-errors)