1 files changed, 8 insertions, 1 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 78b402c9c0a..2cfd247a645 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1376,7 +1376,14 @@ that are not customizable options, as well as faces and groups
                                       (get symbol 'variable-documentation))))
                     (push (list symbol 'custom-variable) found)))))
     (if (not found)
-        (error "No customizable items matching %s" regexp)
+        (error "No %s matching %s"
+               (if (eq all t)
+                   "items"
+                 (format "customizable %s"
+                         (if (memq all '(options faces groups))
+                             (symbol-name all)
+                           "items")))
+               regexp)
       (custom-buffer-create
        (custom-sort-items found t custom-buffer-order-groups)
        "*Customize Apropos*"))))