/[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.902 by kfstorm, Thu Sep 2 22:34:07 2004 UTC revision 1.903 by rms, Fri Sep 3 20:42:04 2004 UTC
# Line 11105  try_scrolling (window, just_this_one_p, Line 11105  try_scrolling (window, just_this_one_p,
11105            start_display (&it, w, startp);            start_display (&it, w, startp);
11106    
11107            if (scroll_conservatively)            if (scroll_conservatively)
11108              amount_to_scroll =              amount_to_scroll
11109                max (dy, FRAME_LINE_HEIGHT (f) * max (scroll_step, temp_scroll_step));                = max (dy, FRAME_LINE_HEIGHT (f) * max (scroll_step, temp_scroll_step));
11110            else if (scroll_step || temp_scroll_step)            else if (scroll_step || temp_scroll_step)
11111              amount_to_scroll = scroll_max;              amount_to_scroll = scroll_max;
11112            else            else
# Line 11385  try_cursor_movement (window, startp, scr Line 11385  try_cursor_movement (window, startp, scr
11385            else if (PT < XFASTINT (w->last_point))            else if (PT < XFASTINT (w->last_point))
11386              {              {
11387                /* Cursor has to be moved backward.  Note that PT >=                /* Cursor has to be moved backward.  Note that PT >=
11388                   CHARPOS (startp) because of the outer                   CHARPOS (startp) because of the outer if-statement.  */
                  if-statement.  */  
11389                while (!row->mode_line_p                while (!row->mode_line_p
11390                       && (MATRIX_ROW_START_CHARPOS (row) > PT                       && (MATRIX_ROW_START_CHARPOS (row) > PT
11391                           || (MATRIX_ROW_START_CHARPOS (row) == PT                           || (MATRIX_ROW_START_CHARPOS (row) == PT
# Line 11898  redisplay_window (window, just_this_one_ Line 11897  redisplay_window (window, just_this_one_
11897               buffer.  */               buffer.  */
11898            || !NILP (Vwindow_scroll_functions)            || !NILP (Vwindow_scroll_functions)
11899            || MINI_WINDOW_P (w)            || MINI_WINDOW_P (w)
11900            || !(used_current_matrix_p =            || !(used_current_matrix_p
11901                 try_window_reusing_current_matrix (w)))                 = try_window_reusing_current_matrix (w)))
11902          {          {
11903            IF_DEBUG (debug_method_add (w, "1"));            IF_DEBUG (debug_method_add (w, "1"));
11904            try_window (window, startp);            try_window (window, startp);
# Line 12028  redisplay_window (window, just_this_one_ Line 12027  redisplay_window (window, just_this_one_
12027        || !NILP (Vwindow_scroll_functions)        || !NILP (Vwindow_scroll_functions)
12028        || !just_this_one_p        || !just_this_one_p
12029        || MINI_WINDOW_P (w)        || MINI_WINDOW_P (w)
12030        || !(used_current_matrix_p =        || !(used_current_matrix_p
12031             try_window_reusing_current_matrix (w)))             = try_window_reusing_current_matrix (w)))
12032      try_window (window, startp);      try_window (window, startp);
12033    
12034    /* If new fonts have been loaded (due to fontsets), give up.  We    /* If new fonts have been loaded (due to fontsets), give up.  We
# Line 15806  If third optional arg NO-PROPS is non-ni Line 15805  If third optional arg NO-PROPS is non-ni
15805    
15806    if (NILP (format) || EQ (format, Qt))    if (NILP (format) || EQ (format, Qt))
15807      {      {
15808        face_id = NILP (format)        face_id = (NILP (format)
15809          ? CURRENT_MODE_LINE_FACE_ID (w) :                   ? CURRENT_MODE_LINE_FACE_ID (w)
15810          HEADER_LINE_FACE_ID;                   : HEADER_LINE_FACE_ID);
15811        format = NILP (format)        format = (NILP (format)
15812          ? current_buffer->mode_line_format                  ? current_buffer->mode_line_format
15813          : current_buffer->header_line_format;                  : current_buffer->header_line_format);
15814      }      }
15815    
15816    init_iterator (&it, w, -1, -1, NULL, face_id);    init_iterator (&it, w, -1, -1, NULL, face_id);
15817    
15818    if (NILP (no_props))    if (NILP (no_props))
15819      {      {
15820        mode_line_string_face =        mode_line_string_face
15821          (face_id == MODE_LINE_FACE_ID ? Qmode_line :          = (face_id == MODE_LINE_FACE_ID ? Qmode_line
15822           face_id == MODE_LINE_INACTIVE_FACE_ID ? Qmode_line_inactive :             : face_id == MODE_LINE_INACTIVE_FACE_ID ? Qmode_line_inactive
15823           face_id == HEADER_LINE_FACE_ID ? Qheader_line : Qnil);             : face_id == HEADER_LINE_FACE_ID ? Qheader_line : Qnil);
15824    
15825        mode_line_string_face_prop =        mode_line_string_face_prop
15826          NILP (mode_line_string_face) ? Qnil :          = (NILP (mode_line_string_face) ? Qnil
15827          Fcons (Qface, Fcons (mode_line_string_face, Qnil));             : Fcons (Qface, Fcons (mode_line_string_face, Qnil)));
15828    
15829        /* We need a dummy last element in mode_line_string_list to        /* We need a dummy last element in mode_line_string_list to
15830           indicate we are building the propertized mode-line string.           indicate we are building the propertized mode-line string.
15831           Using mode_line_string_face_prop here GC protects it.  */           Using mode_line_string_face_prop here GC protects it.  */
15832        mode_line_string_list =        mode_line_string_list
15833          Fcons (mode_line_string_face_prop, Qnil);          = Fcons (mode_line_string_face_prop, Qnil);
15834        frame_title_ptr = NULL;        frame_title_ptr = NULL;
15835      }      }
15836    else    else

Legend:
Removed from v.1.902  
changed lines
  Added in v.1.903

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