# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 889863637 0
# Node ID c42a2b3bbb21193fd30514193ea3e1d8f036bfc5
# Parent  e260c43893638c036f78395611a20c11d9e860f1
(mouse-scroll-subr): Handle if window-end returns nil.

diff -r e260c4389363 -r c42a2b3bbb21 lisp/mouse.el
--- a/lisp/mouse.el	Sat Mar 14 08:19:27 1998 +0000
+++ b/lisp/mouse.el	Sat Mar 14 08:20:37 1998 +0000
@@ -478,11 +478,13 @@
 		 (progn
 		   (set-window-start window (point))
 		   (if (natnump jump)
-		       (progn
-			 (goto-char (window-end window))
-			 ;; window-end doesn't reflect the window's new
-			 ;; start position until the next redisplay.  Hurrah.
-			 (vertical-motion (1- jump) window))
+		       (if (window-end window)
+			   (progn
+			     (goto-char (window-end window))
+			     ;; window-end doesn't reflect the window's new
+			     ;; start position until the next redisplay.
+			     (vertical-motion (1- jump) window))
+			 (vertical-motion (- (window-height window) 2)))
 		     (goto-char (window-start window)))
 		   (if overlay
 		       (move-overlay overlay start (point)))