[Emacs-diffs] Changes to emacs/src/ChangeLog

[Kim F . Storm]

Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4416 emacs/src/ChangeLog:1.4417
*** emacs/src/ChangeLog:1.4416  Tue May 31 21:54:59 2005
--- emacs/src/ChangeLog Tue May 31 22:44:52 2005
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-06-01  Kim F. Storm  <address@hidden>
+ 
+       * xdisp.c (display_mode_line): Support nested calls to redisplay
+       and format-mode-line.  Set mode_line_target to MODE_LINE_DISPLAY.
+ 
  2005-05-31  Stefan Monnier  <address@hidden>
  
        * fileio.c (Finsert_file_contents):
***************
*** 18,28 ****
        (format_mode_line_unwind_data, unwind_format_mode_line):
        New functions for unwind protection in mode line formatting.
        (x_consider_frame_title): Use them and new local var 'title_start'
!       to support nested calls to format-mode-line.  Set mode_line_target
!       to MODE_LINE_TITLE.
        (Fformat_mode_line): Use them and new local var 'string_start' to
!       support nested calls to format-mode-line.  Set mode_line_target to
!       MODE_LINE_NOPROP or MODE_LINE_STRING.  Don't trim trailing dashes.
        (decode_mode_spec): Don't make infinite number of trailing dashes
        for MODE_LINE_NOPROP and MODE_LINE_STRING targets.
        (syms_of_xdisp): Initialize and staticpro mode_line_string_face,
--- 23,34 ----
        (format_mode_line_unwind_data, unwind_format_mode_line):
        New functions for unwind protection in mode line formatting.
        (x_consider_frame_title): Use them and new local var 'title_start'
!       to support nested calls to format-mode-line and redisplay.  Set
!       mode_line_target to MODE_LINE_TITLE.
        (Fformat_mode_line): Use them and new local var 'string_start' to
!       support nested calls to format-mode-line and redisplay.  Set
!       mode_line_target to MODE_LINE_NOPROP or MODE_LINE_STRING.
!       Don't trim trailing dashes.
        (decode_mode_spec): Don't make infinite number of trailing dashes
        for MODE_LINE_NOPROP and MODE_LINE_STRING targets.
        (syms_of_xdisp): Initialize and staticpro mode_line_string_face,