/[emacs]/emacs/src/xdisp.c
ViewVC logotype

Diff of /emacs/src/xdisp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1016 by monnier, Tue May 31 21:54:52 2005 UTC revision 1.1017 by kfstorm, Tue May 31 22:46:22 2005 UTC
# Line 8352  x_consider_frame_title (frame) Line 8352  x_consider_frame_title (frame)
8352        multiple_frames = CONSP (tail);        multiple_frames = CONSP (tail);
8353    
8354        /* Switch to the buffer of selected window of the frame.  Set up        /* Switch to the buffer of selected window of the frame.  Set up
8355           mode_line_noprop_ptr so that display_mode_element will output into it;           mode_line_target so that display_mode_element will output into
8356           then display the title.  */           mode_line_noprop_buf; then display the title.  */
8357        record_unwind_protect (unwind_format_mode_line,        record_unwind_protect (unwind_format_mode_line,
8358                               format_mode_line_unwind_data (current_buffer));                               format_mode_line_unwind_data (current_buffer));
8359    
# Line 15672  display_mode_line (w, face_id, format) Line 15672  display_mode_line (w, face_id, format)
15672  {  {
15673    struct it it;    struct it it;
15674    struct face *face;    struct face *face;
15675      int count = SPECPDL_INDEX ();
15676    
15677    init_iterator (&it, w, -1, -1, NULL, face_id);    init_iterator (&it, w, -1, -1, NULL, face_id);
15678    prepare_desired_row (it.glyph_row);    prepare_desired_row (it.glyph_row);
# Line 15682  display_mode_line (w, face_id, format) Line 15683  display_mode_line (w, face_id, format)
15683      /* Force the mode-line to be displayed in the default face.  */      /* Force the mode-line to be displayed in the default face.  */
15684      it.base_face_id = it.face_id = DEFAULT_FACE_ID;      it.base_face_id = it.face_id = DEFAULT_FACE_ID;
15685    
15686      record_unwind_protect (unwind_format_mode_line,
15687                             format_mode_line_unwind_data (NULL));
15688    
15689      mode_line_target = MODE_LINE_DISPLAY;
15690    
15691    /* Temporarily make frame's keyboard the current kboard so that    /* Temporarily make frame's keyboard the current kboard so that
15692       kboard-local variables in the mode_line_format will get the right       kboard-local variables in the mode_line_format will get the right
15693       values.  */       values.  */
# Line 15689  display_mode_line (w, face_id, format) Line 15695  display_mode_line (w, face_id, format)
15695    display_mode_element (&it, 0, 0, 0, format, Qnil, 0);    display_mode_element (&it, 0, 0, 0, format, Qnil, 0);
15696    pop_frame_kboard ();    pop_frame_kboard ();
15697    
15698      unbind_to (count, Qnil);
15699    
15700    /* Fill up with spaces.  */    /* Fill up with spaces.  */
15701    display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0);    display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0);
15702    

Legend:
Removed from v.1.1016  
changed lines
  Added in v.1.1017

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26