From: Glenn Morris <rgm@gnu.org>
Date: Thu, 10 Mar 2011 03:44:33 +0000 (-0800)
Subject: cus-edit tweak for bug#2298.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~616
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5772caab78b85b6ae1215fbc5d63cbb4571bcf28;p=emacs.git

cus-edit tweak for bug#2298.

* lisp/cus-edit.el (Custom-newline): If no button at point, look for a
subgroup button at start-of-line.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63e132e9550..bd8bf932799 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-10  Glenn Morris  <rgm@gnu.org>
 
+	* cus-edit.el (Custom-newline): If no button at point, look
+	for a subgroup button at start-of-line.  (Bug#2298)
+
 	* mail/rmail.el (rmail-msgend, rmail-msgbeg): Doc fixes.
 
 2011-03-10  Julien Danjou  <julien@danjou.info>
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"))))