mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Revert last change.
This commit is contained in:
parent
185d1922fb
commit
a008c8f4fc
3 changed files with 11 additions and 17 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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."
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue