2 files changed, 8 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a09227f4136..8fd1f8a4255 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (custom-no-edit): Revert 2006-07-27 change, so that
+        self-insert-command keys don't activate buttons.
+        (custom-mode-map): Just don't bind "\C-m" to `custom-no-edit'.
+
 2006-07-29  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-info-breakpoints-custom): Use different
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 15f43080aff..0493dd0894c 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4435,9 +4435,7 @@ The format is suitable for use with `easy-menu-define'."
   ;; Actually, this misfeature of dense keymaps was fixed on 2001-11-26.
   (let ((map (make-keymap)))
     (set-keymap-parent map widget-keymap)
-    (define-key map [remap self-insert-command]
-      'custom-no-edit)
-    (define-key map "\^m" 'custom-no-edit)
+    (define-key map [remap self-insert-command] 'custom-no-edit)
     (define-key map " " 'scroll-up)
     (define-key map "\177" 'scroll-down)
     (define-key map "\C-c\C-c" 'Custom-set)
@@ -4452,10 +4450,7 @@ The format is suitable for use with `easy-menu-define'."
 (defun custom-no-edit (pos &optional event)
   "Invoke button at POS, or refuse to allow editing of Custom buffer."
   (interactive "@d")
-  (let ((button (get-char-property pos 'button)))
-    (if button
-        (widget-apply-action button event)
-      (error "You can't edit this part of the Custom buffer"))))
+  (error "You can't edit this part of the Custom buffer"))
 
 (easy-menu-define Custom-mode-menu
     custom-mode-map