Mercurial > emacs
changeset 69514:4540a0223bcc
* mouse.el (mouse-drag-vertical-line): Use window-inside-edges
when checking for attempt to drag leftmost or rightmost scrollbar.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 16 Mar 2006 15:14:57 +0000 |
| parents | 5793d5bfdf38 |
| children | 9fba91bc5b5d |
| files | lisp/ChangeLog lisp/mouse.el |
| diffstat | 2 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Mar 16 08:06:16 2006 +0000 +++ b/lisp/ChangeLog Thu Mar 16 15:14:57 2006 +0000 @@ -1,3 +1,8 @@ +2006-03-16 Martin Rudalics <rudalics@gmx.at> + + * mouse.el (mouse-drag-vertical-line): Use window-inside-edges + when checking for attempt to drag leftmost or rightmost scrollbar. + 2006-03-16 Nick Roberts <nickrob@snap.net.nz> * progmodes/gdb-ui.el (gdb-inferior-status): New variable.
--- a/lisp/mouse.el Thu Mar 16 08:06:16 2006 +0000 +++ b/lisp/mouse.el Thu Mar 16 15:14:57 2006 +0000 @@ -538,19 +538,20 @@ (echo-keystrokes 0) (start-event-frame (window-frame (car (car (cdr start-event))))) (start-event-window (car (car (cdr start-event)))) - (start-nwindows (count-windows t)) event mouse x left right edges wconfig growth (which-side (or (cdr (assq 'vertical-scroll-bars (frame-parameters start-event-frame))) 'right))) - (if (one-window-p t) - (error "Attempt to resize sole ordinary window")) - (if (eq which-side 'right) - (if (= (nth 2 (window-edges start-event-window)) - (frame-width start-event-frame)) - (error "Attempt to drag rightmost scrollbar")) - (if (= (nth 0 (window-edges start-event-window)) 0) - (error "Attempt to drag leftmost scrollbar"))) + (cond + ((one-window-p t) + (error "Attempt to resize sole ordinary window")) + ((and (eq which-side 'right) + (>= (nth 2 (window-inside-edges start-event-window)) + (frame-width start-event-frame))) + (error "Attempt to drag rightmost scrollbar")) + ((and (eq which-side 'left) + (= (nth 0 (window-inside-edges start-event-window)) 0)) + (error "Attempt to drag leftmost scrollbar"))) (track-mouse (progn ;; enlarge-window only works on the selected window, so