From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 17 Oct 2005 23:46:28 +0000 (+0000)
Subject: Revert last change.
X-Git-Tag: emacs-pretest-22.0.90~6532
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a008c8f4fc678112e3a0a3588e71f121c2837938;p=emacs.git

Revert last change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f059ad388be..ebc420983fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,3 @@
-2005-10-17  Chong Yidong  <cyd@stupidchicken.com>
-
-	* cus-edit.el (Custom-move-and-invoke): Delete function.
-	(custom-mode-map): Remove Custom-move-and-invoke binding.
-
-	* wid-edit.el (widget-move-and-invoke): New function.
-	(widget-keymap): Bind mouse-1 to it.
-
 2005-10-17  Bill Wohler  <wohler@newt.com>
 
 	Moved all remaining images from lisp/toolbar to etc/images, moved
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 026911686b1..8f88e4d049c 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4245,9 +4245,20 @@ 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] 'Custom-move-and-invoke)
     map)
   "Keymap for `custom-mode'.")
 
+(defun Custom-move-and-invoke (event)
+  "Move to where you click, and if it is an active field, invoke it."
+  (interactive "e")
+  (mouse-set-point event)
+  (if (widget-event-point event)
+      (let* ((pos (widget-event-point event))
+	     (button (get-char-property pos 'button)))
+	(if button
+	    (widget-button-click event)))))
+
 (easy-menu-define Custom-mode-menu
     custom-mode-map
   "Menu used in customization buffers."
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index ce186d1b68f..8335a202120 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -849,7 +849,6 @@ button end points."
     (define-key map "\t" 'widget-forward)
     (define-key map [(shift tab)] 'widget-backward)
     (define-key map [backtab] 'widget-backward)
-    (define-key map [mouse-1] 'widget-move-and-invoke)
     (define-key map [down-mouse-2] 'widget-button-click)
     (define-key map "\C-m" 'widget-button-press)
     map)
@@ -902,14 +901,6 @@ Recommended as a parent keymap for modes using widgets.")
 ;; backward-compatibility alias
 (put 'widget-button-pressed-face 'face-alias 'widget-button-pressed)
 
-(defun widget-move-and-invoke (event)
-  "Move to where you click, and if it is an active field, invoke it."
-  (interactive "e")
-  (mouse-set-point event)
-  (let ((pos (widget-event-point event)))
-    (if (and pos (get-char-property pos 'button))
-	(widget-button-click event))))
-	
 (defun widget-button-click (event)
   "Invoke the button that the mouse is pointing at."
   (interactive "e")