Merge from trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 88821652784..203043ebd97 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4756,6 +4756,12 @@ The format is suitable for use with `easy-menu-define'."
   "Invoke button at POS, or refuse to allow editing of Custom buffer."
   (interactive "@d")
   (let ((button (get-char-property pos 'button)))
+    ;; If there is no button at point, then use the one at the start
+    ;; of the line, if it is a custom-group-link (bug#2298).
+    (or button
+        (if (setq button (get-char-property (line-beginning-position) 'button))
+            (or (eq (widget-type button) 'custom-group-link)
+                (setq button nil))))
     (if button
         (widget-apply-action button event)
       (error "You can't edit this part of the Custom buffer"))))