Merged in changes from CVS trunk.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-404

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/xdisp.c
index b887c8d702ce8c72d18be97029aeed95111618b4,f06121a475cf6123fc4af411601e84e5af2b3b69..bc016fb7c799524ea56f5e81b56ac9cebb80615b
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -10702,12 -10689,15 +10693,15 @@@ redisplay_internal (preserve_echo_area
          /* Do the mark_window_display_accurate after all windows have
             been redisplayed because this call resets flags in buffers
             which are needed for proper redisplay.  */
-         for (i = 0; i < n; ++i)
+         FOR_EACH_FRAME (tail, frame)
            {
-             struct frame *f = updated[i];
-             mark_window_display_accurate (f->root_window, 1);
-             if (FRAME_DEVICE (f)->frame_up_to_date_hook)
-               FRAME_DEVICE (f)->frame_up_to_date_hook (f);
+             struct frame *f = XFRAME (frame);
 -            if (f->updated_p)
 -              {
 -                mark_window_display_accurate (f->root_window, 1);
 -                if (frame_up_to_date_hook)
 -                  frame_up_to_date_hook (f);
 -              }
++              if (f->updated_p)
++                {
++                  mark_window_display_accurate (f->root_window, 1);
++                  if (FRAME_DEVICE (f)->frame_up_to_date_hook)
++                    FRAME_DEVICE (f)->frame_up_to_date_hook (f);
++                }
            }
        }
      }

diff --cc src/xfaces.c
Simple merge