diff options
| author | Miles Bader <miles@gnu.org> | 2006-09-20 06:04:23 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-09-20 06:04:23 +0000 |
| commit | 465384748f74266cec1e2b9c9308eb82efb462b1 (patch) | |
| tree | 28b11f0a737ad1add652e84c1f193843322be702 /lisp/wid-edit.el | |
| parent | 863153c57b164f79f030f34dba6953a3d0d60097 (diff) | |
| parent | 0327a4644bffc9570fe50dbb7a13a54726c4ff8b (diff) | |
| download | emacs-465384748f74266cec1e2b9c9308eb82efb462b1.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 437-446)
- Update from CVS
- lisp/url/url-methods.el: Fix format error when http_proxy is empty string
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 137-140)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111
Diffstat (limited to 'lisp/wid-edit.el')
| -rw-r--r-- | lisp/wid-edit.el | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 30828c8d93e..ba7a9b4a0a1 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -959,15 +959,18 @@ Recommended as a parent keymap for modes using widgets.") (push event unread-command-events) (setq event oevent) (throw 'button-press-cancelled t)) - (setq pos (widget-event-point event)) - (if (and pos - (eq (get-char-property pos 'button) - button)) - (when face - (overlay-put overlay 'face pressed-face) - (overlay-put overlay 'mouse-face pressed-face)) - (overlay-put overlay 'face face) - (overlay-put overlay 'mouse-face mouse-face))))) + (unless (or (integerp event) + (memq (car event) '(switch-frame select-window)) + (eq (car event) 'scroll-bar-movement)) + (setq pos (widget-event-point event)) + (if (and pos + (eq (get-char-property pos 'button) + button)) + (when face + (overlay-put overlay 'face pressed-face) + (overlay-put overlay 'mouse-face pressed-face)) + (overlay-put overlay 'face face) + (overlay-put overlay 'mouse-face mouse-face)))))) ;; When mouse is released over the button, run ;; its action function. |