Mercurial > emacs
comparison lisp/wid-edit.el @ 90602:b5c13d1564a9
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 20 Sep 2006 06:04:23 +0000 |
parents | 9e490faa9f6b 1a9df4096f4e |
children | bb0e318b7c53 |
comparison
equal
deleted
inserted
replaced
90601:a1a25ac6c88a | 90602:b5c13d1564a9 |
---|---|
957 (setq event (read-event)) | 957 (setq event (read-event)) |
958 (when (and mouse-1 (mouse-movement-p event)) | 958 (when (and mouse-1 (mouse-movement-p event)) |
959 (push event unread-command-events) | 959 (push event unread-command-events) |
960 (setq event oevent) | 960 (setq event oevent) |
961 (throw 'button-press-cancelled t)) | 961 (throw 'button-press-cancelled t)) |
962 (setq pos (widget-event-point event)) | 962 (unless (or (integerp event) |
963 (if (and pos | 963 (memq (car event) '(switch-frame select-window)) |
964 (eq (get-char-property pos 'button) | 964 (eq (car event) 'scroll-bar-movement)) |
965 button)) | 965 (setq pos (widget-event-point event)) |
966 (when face | 966 (if (and pos |
967 (overlay-put overlay 'face pressed-face) | 967 (eq (get-char-property pos 'button) |
968 (overlay-put overlay 'mouse-face pressed-face)) | 968 button)) |
969 (overlay-put overlay 'face face) | 969 (when face |
970 (overlay-put overlay 'mouse-face mouse-face))))) | 970 (overlay-put overlay 'face pressed-face) |
971 (overlay-put overlay 'mouse-face pressed-face)) | |
972 (overlay-put overlay 'face face) | |
973 (overlay-put overlay 'mouse-face mouse-face)))))) | |
971 | 974 |
972 ;; When mouse is released over the button, run | 975 ;; When mouse is released over the button, run |
973 ;; its action function. | 976 ;; its action function. |
974 (when (and pos | 977 (when (and pos |
975 (eq (get-char-property pos 'button) button)) | 978 (eq (get-char-property pos 'button) button)) |