diff --git a/src/ChangeLog b/src/ChangeLog
index 150f193af0b..0408deade82 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -22,6 +22,8 @@
 	* window.c (window_loop, size_window):
 	(run_window_configuration_change_hook, enlarge_window): Likewise.
 
+	* window.c (display_buffer): Now static.
+
 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
diff --git a/src/window.c b/src/window.c
index 2ec51a756d4..838be475d51 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3604,7 +3604,7 @@ select_frame_norecord (Lisp_Object frame)
     ? Fselect_frame (frame, Qt) : selected_frame;
 }
 
-Lisp_Object
+static Lisp_Object
 display_buffer (Lisp_Object buffer, Lisp_Object not_this_window_p, Lisp_Object override_frame)
 {
   return call3 (Qdisplay_buffer, buffer, not_this_window_p, override_frame);