aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2006-09-19 16:32:07 +0000
committerStefan Monnier2006-09-19 16:32:07 +0000
commit31790df395a5c0a9c6592621b797e2932c8faf54 (patch)
tree455cefaab15a41dd24a64a19c323087cff432619 /src
parent713f23f207cd73c74f95fbe3b4cb71b59ec56e0e (diff)
downloademacs-31790df395a5c0a9c6592621b797e2932c8faf54.tar.gz
emacs-31790df395a5c0a9c6592621b797e2932c8faf54.zip
(Fwindow_end): Fix recent change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/window.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e8d62e69552..6fec97d5a8b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-09-19 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * window.c (Fwindow_end): Fix recent change.
4
12006-09-19 Kim F. Storm <storm@cua.dk> 52006-09-19 Kim F. Storm <storm@cua.dk>
2 6
3 * window.c (Fset_window_hscroll, Fpos_visible_in_window_p): 7 * window.c (Fset_window_hscroll, Fpos_visible_in_window_p):
@@ -80,8 +84,8 @@
80 84
812006-09-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 852006-09-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
82 86
83 * gtkutil.c (xg_get_file_with_chooser): Check 87 * gtkutil.c (xg_get_file_with_chooser):
84 x-gtk-show-chooser-help-text before adding the help text. 88 Check x-gtk-show-chooser-help-text before adding the help text.
85 89
86 * xfns.c (syms_of_xfns): New variable: x-gtk-show-chooser-help-text. 90 * xfns.c (syms_of_xfns): New variable: x-gtk-show-chooser-help-text.
87 91
diff --git a/src/window.c b/src/window.c
index adb384b72e5..3b78bba64c0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1162,7 +1162,7 @@ if it isn't already recorded. */)
1162 Lisp_Object value; 1162 Lisp_Object value;
1163 struct window *w = decode_window (window); 1163 struct window *w = decode_window (window);
1164 Lisp_Object buf; 1164 Lisp_Object buf;
1165 struct buffer *b = XBUFFER (buf); 1165 struct buffer *b;
1166 1166
1167 buf = w->buffer; 1167 buf = w->buffer;
1168 CHECK_BUFFER (buf); 1168 CHECK_BUFFER (buf);