aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-08-01 18:39:21 +0300
committerEli Zaretskii2012-08-01 18:39:21 +0300
commit4f5d0325f3287f2f2e0dff1a2ec94a63b831afd7 (patch)
tree6fe325629b4fe9cfc592cbb5fb652aca43b2f628
parenta0f95636d5aec4a8b07158818fc0ff763cbc9ac5 (diff)
downloademacs-4f5d0325f3287f2f2e0dff1a2ec94a63b831afd7.tar.gz
emacs-4f5d0325f3287f2f2e0dff1a2ec94a63b831afd7.zip
Fix fallout from 2012-08-01T05:11:36Z!dmantipov@yandex.ru that introduced WVAR.
src/xdisp.c (try_window_id): Use WVAR in IF_DEBUG code.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3640524b410..25bfa03b0b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-08-01 Eli Zaretskii <eliz@gnu.org>
2
3 * xdisp.c (try_window_id): Use WVAR in IF_DEBUG code.
4
12012-08-01 Glenn Morris <rgm@gnu.org> 52012-08-01 Glenn Morris <rgm@gnu.org>
2 6
3 * s/msdos.h: Remove file. 7 * s/msdos.h: Remove file.
diff --git a/src/xdisp.c b/src/xdisp.c
index 7d7e2acc74d..3e14b06357c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17834,8 +17834,8 @@ try_window_id (struct window *w)
17834 else 17834 else
17835 abort (); 17835 abort ();
17836 17836
17837 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos); 17837 IF_DEBUG (debug_end_pos = XFASTINT (WVAR (w, window_end_pos));
17838 debug_end_vpos = XFASTINT (w->window_end_vpos)); 17838 debug_end_vpos = XFASTINT (WVAR (w, window_end_vpos)));
17839 17839
17840 /* Record that display has not been completed. */ 17840 /* Record that display has not been completed. */
17841 WVAR (w, window_end_valid) = Qnil; 17841 WVAR (w, window_end_valid) = Qnil;