changeset 68911:f484ff9069d6

* wid-edit.el (widget-keymap): Bind down-mouse-1 to widget-button-click. * cus-edit.el (custom-mode-map): Remove mouse-1 binding.
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 15 Feb 2006 02:41:02 +0000
parents 4b8d82ef7d06
children 13d48b135711
files lisp/ChangeLog lisp/cus-edit.el lisp/wid-edit.el
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Feb 15 02:35:20 2006 +0000
+++ b/lisp/ChangeLog	Wed Feb 15 02:41:02 2006 +0000
@@ -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,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* cus-start.el (all): Add x-gtk-whole-detached-tool-bar.
--- a/lisp/cus-edit.el	Wed Feb 15 02:35:20 2006 +0000
+++ b/lisp/cus-edit.el	Wed Feb 15 02:41:02 2006 +0000
@@ -4369,7 +4369,6 @@
     (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'.")
 
--- a/lisp/wid-edit.el	Wed Feb 15 02:35:20 2006 +0000
+++ b/lisp/wid-edit.el	Wed Feb 15 02:41:02 2006 +0000
@@ -860,6 +860,7 @@
     (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.