aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/cus-edit.el5
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02cc24a2a36..44172fa2a70 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-02-09 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-09 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * cus-edit.el (customize-apropos): Fix error string.
4
3 * dired-aux.el (dired-copy-file-recursive): Remove slighly 5 * dired-aux.el (dired-copy-file-recursive): Remove slighly
4 misleading comment (bug#11328). 6 misleading comment (bug#11328).
5 7
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 5b03d3d57c7..8c3617de633 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1450,7 +1450,10 @@ If TYPE is `groups', include only groups."
1450 (custom-variable-p symbol))) 1450 (custom-variable-p symbol)))
1451 (push (list symbol 'custom-variable) found)))))) 1451 (push (list symbol 'custom-variable) found))))))
1452 (unless found 1452 (unless found
1453 (error "No customizable %s matching %s" (symbol-name type) pattern)) 1453 (error "No customizable %s matching %s" (if (not type)
1454 "group, face, or option"
1455 (symbol-name type))
1456 pattern))
1454 (custom-buffer-create 1457 (custom-buffer-create
1455 (custom-sort-items found t custom-buffer-order-groups) 1458 (custom-sort-items found t custom-buffer-order-groups)
1456 "*Customize Apropos*"))) 1459 "*Customize Apropos*")))