aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-06 23:06:05 -0800
committerPaul Eggert2011-03-06 23:06:05 -0800
commit7e5cf297731ddb042bfc5effa2128acfc776cc09 (patch)
tree6dad9c8c97e7edc16c18a3542a8c191071cf3267 /src
parent4554d213635d99c2461e0fc20441fd0e7f14435d (diff)
downloademacs-7e5cf297731ddb042bfc5effa2128acfc776cc09.tar.gz
emacs-7e5cf297731ddb042bfc5effa2128acfc776cc09.zip
* window.c (display_buffer): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/window.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 150f193af0b..0408deade82 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -22,6 +22,8 @@
22 * window.c (window_loop, size_window): 22 * window.c (window_loop, size_window):
23 (run_window_configuration_change_hook, enlarge_window): Likewise. 23 (run_window_configuration_change_hook, enlarge_window): Likewise.
24 24
25 * window.c (display_buffer): Now static.
26
252011-03-06 Chong Yidong <cyd@stupidchicken.com> 272011-03-06 Chong Yidong <cyd@stupidchicken.com>
26 28
27 * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 29 * 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)
3604 ? Fselect_frame (frame, Qt) : selected_frame; 3604 ? Fselect_frame (frame, Qt) : selected_frame;
3605} 3605}
3606 3606
3607Lisp_Object 3607static Lisp_Object
3608display_buffer (Lisp_Object buffer, Lisp_Object not_this_window_p, Lisp_Object override_frame) 3608display_buffer (Lisp_Object buffer, Lisp_Object not_this_window_p, Lisp_Object override_frame)
3609{ 3609{
3610 return call3 (Qdisplay_buffer, buffer, not_this_window_p, override_frame); 3610 return call3 (Qdisplay_buffer, buffer, not_this_window_p, override_frame);