[Emacs-diffs] Changes to emacs/src/dispnew.c,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/07/10 23:52:38

Index: dispnew.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispnew.c,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -b -r1.371 -r1.372
--- dispnew.c   10 Jul 2006 18:51:31 -0000      1.371
+++ dispnew.c   10 Jul 2006 23:52:38 -0000      1.372
@@ -6532,19 +6532,26 @@
 }
 
 
-DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 0, 0,
-       doc: /* Perform redisplay.
-If input is available before this starts, redisplay is preempted
-unless `redisplay-dont-pause' is non-nil.  */)
-     ()
+DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0,
+       doc: /* Perform redisplay if no input is available.
+If optional arg FORCE is non-nil, perform a full redisplay even if
+input is available.  */)
+     (force)
+  Lisp_Object force;
 {
+  int count;
+
   swallow_events (Qt);
   if ((detect_input_pending_run_timers (Qt)
-       && NILP (Qredisplay_dont_pause))
+       && NILP (force) && !redisplay_dont_pause)
       || !NILP (Vexecuting_kbd_macro))
     return Qnil;
 
+  count = SPECPDL_INDEX ();
+  if (!NILP (force) && !redisplay_dont_pause)
+    specbind (Qredisplay_dont_pause, Qt);
   redisplay_preserve_echo_area (2);
+  unbind_to (count, Qnil);
   return Qt;
 }