aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2005-07-30 19:04:19 +0000
committerJuanma Barranquero2005-07-30 19:04:19 +0000
commite2b64074e76730218f85de1d63ceb6832e579d01 (patch)
tree51e08480b2d2cb39c220d6da320f634d180a168d /src
parent43e124e6826ab3d1e92921638577696d13d36646 (diff)
downloademacs-e2b64074e76730218f85de1d63ceb6832e579d01.tar.gz
emacs-e2b64074e76730218f85de1d63ceb6832e579d01.zip
(syms_of_xdisp) <redisplay-end-trigger-functions>: Defvar it.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ef08e1e2f66..d4df7540583 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12005-07-30 Juanma Barranquero <lekktu@gmail.com>
2
3 * xdisp.c (syms_of_xdisp) <redisplay-end-trigger-functions>:
4 Defvar it.
5
12005-07-28 Juanma Barranquero <lekktu@gmail.com> 62005-07-28 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * w32fns.c (my_set_window_pos, my_show_window): Don't declare. 8 * w32fns.c (my_set_window_pos, my_show_window): Don't declare.
diff --git a/src/xdisp.c b/src/xdisp.c
index 09cf8a7f5de..d7de7dbe826 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -231,7 +231,7 @@ extern Lisp_Object Qhelp_echo;
231 231
232Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; 232Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
233Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; 233Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
234Lisp_Object Qredisplay_end_trigger_functions; 234Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
235Lisp_Object Qinhibit_point_motion_hooks; 235Lisp_Object Qinhibit_point_motion_hooks;
236Lisp_Object QCeval, QCfile, QCdata, QCpropertize; 236Lisp_Object QCeval, QCfile, QCdata, QCpropertize;
237Lisp_Object Qfontified; 237Lisp_Object Qfontified;
@@ -23136,6 +23136,12 @@ and its new display-start position. Note that the value of `window-end'
23136is not valid when these functions are called. */); 23136is not valid when these functions are called. */);
23137 Vwindow_scroll_functions = Qnil; 23137 Vwindow_scroll_functions = Qnil;
23138 23138
23139 DEFVAR_LISP ("redisplay-end-trigger-functions", &Vredisplay_end_trigger_functions,
23140 doc: /* Functions called when redisplay of a window reaches the end trigger.
23141Each function is called with two arguments, the window and the end trigger value.
23142See `set-window-redisplay-end-trigger'. */);
23143 Vredisplay_end_trigger_functions = Qnil;
23144
23139 DEFVAR_BOOL ("mouse-autoselect-window", &mouse_autoselect_window, 23145 DEFVAR_BOOL ("mouse-autoselect-window", &mouse_autoselect_window,
23140 doc: /* *Non-nil means autoselect window with mouse pointer. */); 23146 doc: /* *Non-nil means autoselect window with mouse pointer. */);
23141 mouse_autoselect_window = 0; 23147 mouse_autoselect_window = 0;