* wid-edit.el (widget-keymap): Bind down-mouse-1 to

	widget-button-click.

	* cus-edit.el (custom-mode-map): Remove mouse-1 binding.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10b4816e9e79fd1429efd0fcb3c7d5029ab2d058..438907164b8747d4a05a35a540b8bf407b5a7336 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2006-02-14  Chong Yidong  <cyd@stupidchicken.com>
 
+       * wid-edit.el (widget-keymap): Bind down-mouse-1 to
+       widget-button-click.
+
+       * cus-edit.el (custom-mode-map): Remove mouse-1 binding.
+
        * files.el (hack-local-variables-confirm): Allow scrolling if the
        file variable list is too long.  Kill temp buffer after use.
 
@@ -35,6 +40,7 @@
        * files.el (hack-local-variables): Remove ignored variables before
        checking if any variables need setting.
 
+>>>>>>> 1.9141
 2006-02-14  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * cus-start.el (all): Add x-gtk-whole-detached-tool-bar.

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0595336c3ed91dae748a4049cd06e3166a1a49ac..87e902ac65eaf8c7d649bb559d017f0156ae8ae8 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4369,7 +4369,6 @@ The format is suitable for use with `easy-menu-define'."
     (define-key map "u" 'Custom-goto-parent)
     (define-key map "n" 'widget-forward)
     (define-key map "p" 'widget-backward)
-    (define-key map [mouse-1] 'widget-move-and-invoke)
     map)
   "Keymap for `custom-mode'.")
 

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 52bf3a212be29b6ec28e6060b4fe2d8c1b44fca1..659c562ea659dfc3e6f331eedc468325f30ab6e3 100644 (file)
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -860,6 +860,7 @@ button end points."
     (define-key map [(shift tab)] 'advertised-widget-backward)
     (define-key map [backtab] 'widget-backward)
     (define-key map [down-mouse-2] 'widget-button-click)
+    (define-key map [down-mouse-1] 'widget-button-click)
     (define-key map "\C-m" 'widget-button-press)
     map)
   "Keymap containing useful binding for buffers containing widgets.