Mercurial > emacs
comparison lisp/mwheel.el @ 107874:b97c55098dcc
Check both `isearch-scroll' and `scroll-command' properties.
* isearch.el (isearch-lookup-scroll-key): Check both
`isearch-scroll' and `scroll-command' properties.
(scroll-up, scroll-down): Remove `isearch-scroll' property.
* mwheel.el (mwheel-scroll): Remove `isearch-scroll' property.
* simple.el (scroll-up-command, scroll-down-command)
(scroll-up-line, scroll-down-line): Remove `isearch-scroll' property.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Fri, 16 Apr 2010 04:24:00 +0300 |
| parents | d7b161b7a686 |
| children | 280c8ae2476d |
comparison
equal
deleted
inserted
replaced
| 107873:b88763a1166b | 107874:b97c55098dcc |
|---|---|
| 245 (setq mwheel-inhibit-click-event-timer | 245 (setq mwheel-inhibit-click-event-timer |
| 246 (run-with-timer mouse-wheel-inhibit-click-time nil | 246 (run-with-timer mouse-wheel-inhibit-click-time nil |
| 247 'mwheel-inhibit-click-timeout)))) | 247 'mwheel-inhibit-click-timeout)))) |
| 248 | 248 |
| 249 (put 'mwheel-scroll 'scroll-command t) | 249 (put 'mwheel-scroll 'scroll-command t) |
| 250 (put 'mwheel-scroll 'isearch-scroll t) | |
| 251 | 250 |
| 252 (defvar mwheel-installed-bindings nil) | 251 (defvar mwheel-installed-bindings nil) |
| 253 | 252 |
| 254 ;; preloaded ;;;###autoload | 253 ;; preloaded ;;;###autoload |
| 255 (define-minor-mode mouse-wheel-mode | 254 (define-minor-mode mouse-wheel-mode |