2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 708122e35fa..c095f3e66c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.c (window_scroll_pixel_based): Signal "Beginning of
+        buffer" when scroll-down at the beginning of an empty buffer.
+
 2006-06-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.c [USE_MAC_TSM] (mac_handle_text_input_event): Exclude
diff --git a/src/window.c b/src/window.c
index acb4c5cfbdd..e0ea9beb211 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4895,6 +4895,8 @@ window_scroll_pixel_based (window, n, whole, noerror)
             }
           else if (noerror)
             return;
+          else if (n < 0)       /* could happen with empty buffers */
+            Fsignal (Qbeginning_of_buffer, Qnil);
           else
             Fsignal (Qend_of_buffer, Qnil);
         }