[Emacs-diffs] Changes to emacs/src/indent.c

[Kim F . Storm]

Index: emacs/src/indent.c
diff -c emacs/src/indent.c:1.162 emacs/src/indent.c:1.163
*** emacs/src/indent.c:1.162    Mon Aug  2 15:06:06 2004
--- emacs/src/indent.c  Mon Aug  2 23:42:14 2004
***************
*** 1231,1236 ****
--- 1231,1237 ----
    int prev_vpos = 0;
    int contin_hpos;            /* HPOS of last column of continued line.  */
    int prev_tab_offset;                /* Previous tab offset.  */
+   int continuation_glyph_width;
  
    XSETBUFFER (buffer, current_buffer);
    XSETWINDOW (window, win);
***************
*** 1259,1264 ****
--- 1260,1271 ----
        width -= 1;
      }
  
+   continuation_glyph_width = 0;
+ #ifdef HAVE_WINDOW_SYSTEM
+   if (!FRAME_WINDOW_P (XFRAME (win->frame)))
+     continuation_glyph_width = 1;
+ #endif
+ 
    immediate_quit = 1;
    QUIT;
  
***************
*** 1382,1388 ****
        {
          if (hscroll
              || (truncate_partial_width_windows
!                 && width < FRAME_COLS (XFRAME (WINDOW_FRAME (win))))
              || !NILP (current_buffer->truncate_lines))
            {
              /* Truncating: skip to newline, unless we are already past
--- 1389,1396 ----
        {
          if (hscroll
              || (truncate_partial_width_windows
!                 && ((width + continuation_glyph_width)
!                     < FRAME_COLS (XFRAME (WINDOW_FRAME (win)))))
              || !NILP (current_buffer->truncate_lines))
            {
              /* Truncating: skip to newline, unless we are already past
***************
*** 1666,1672 ****
                      hpos -= hscroll;
                      /* Count the truncation glyph on column 0 */
                      if (hscroll > 0)
!                       hpos++;
                      tab_offset = 0;
                    }
                  contin_hpos = 0;
--- 1674,1680 ----
                      hpos -= hscroll;
                      /* Count the truncation glyph on column 0 */
                      if (hscroll > 0)
!                       hpos += continuation_glyph_width;
                      tab_offset = 0;
                    }
                  contin_hpos = 0;