aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRomain Francoise2005-10-09 16:53:35 +0000
committerRomain Francoise2005-10-09 16:53:35 +0000
commit41791a20d7136db79a0b44a281b65216de35a4cf (patch)
tree944885d2ed06b0bcb4580362e28eef5798aaa364 /src
parent74ab0905032874f203a43dbc93a6df5e8a2fc136 (diff)
downloademacs-41791a20d7136db79a0b44a281b65216de35a4cf.tar.gz
emacs-41791a20d7136db79a0b44a281b65216de35a4cf.zip
(Fwindow_end): Don't try to redisplay if non-interactive.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/window.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d9b2eb7ab3c..693ddb3bf57 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,10 @@
12005-10-09 Romain Francoise <romain@orebokech.com>
2
3 * window.c (Fwindow_end): Don't try to redisplay if non-interactive.
4
12005-10-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 52005-10-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 6
3 * emacs.c (standard_args): Removed options -i, -itype, --icon-type, 7 * emacs.c (standard_args): Removed options -i, -itype, --icon-type,
4 added -nb, --no-bitmap-icon. 8 added -nb, --no-bitmap-icon.
5 9
6 * xfns.c (Fx_create_frame): Make bitmapIcon have default on. 10 * xfns.c (Fx_create_frame): Make bitmapIcon have default on.
diff --git a/src/window.c b/src/window.c
index 3e9354a7ba8..9ef4fc2eacd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1029,7 +1029,8 @@ if it isn't already recorded. */)
1029 1029
1030 if (! NILP (update) 1030 if (! NILP (update)
1031 && ! (! NILP (w->window_end_valid) 1031 && ! (! NILP (w->window_end_valid)
1032 && XFASTINT (w->last_modified) >= MODIFF)) 1032 && XFASTINT (w->last_modified) >= MODIFF)
1033 && !noninteractive)
1033 { 1034 {
1034 struct text_pos startp; 1035 struct text_pos startp;
1035 struct it it; 1036 struct it it;