mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-12 18:55:13 -08:00
Merge remote-tracking branch 'origin/master' into feature/pgtk
This commit is contained in:
commit
9fe993371b
1 changed files with 13 additions and 12 deletions
|
|
@ -477,18 +477,19 @@ wheel."
|
|||
(if (and (nth 4 event)
|
||||
(zerop (window-hscroll window)))
|
||||
(let ((delta (round (cdr (nth 4 event)))))
|
||||
(if (> (abs delta) (window-text-height window t))
|
||||
(mwheel-scroll event nil)
|
||||
(with-selected-window window
|
||||
(condition-case nil
|
||||
(if (< delta 0)
|
||||
(pixel-scroll-precision-scroll-down (- delta))
|
||||
(pixel-scroll-precision-scroll-up delta))
|
||||
;; Do not ding at buffer limits. Show a message instead.
|
||||
(beginning-of-buffer
|
||||
(message (error-message-string '(beginning-of-buffer))))
|
||||
(end-of-buffer
|
||||
(message (error-message-string '(end-of-buffer))))))))
|
||||
(unless (zerop delta)
|
||||
(if (> (abs delta) (window-text-height window t))
|
||||
(mwheel-scroll event nil)
|
||||
(with-selected-window window
|
||||
(condition-case nil
|
||||
(if (< delta 0)
|
||||
(pixel-scroll-precision-scroll-down (- delta))
|
||||
(pixel-scroll-precision-scroll-up delta))
|
||||
;; Do not ding at buffer limits. Show a message instead.
|
||||
(beginning-of-buffer
|
||||
(message (error-message-string '(beginning-of-buffer))))
|
||||
(end-of-buffer
|
||||
(message (error-message-string '(end-of-buffer)))))))))
|
||||
(mwheel-scroll event nil))))
|
||||
|
||||
;;;###autoload
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue