Deleted Added
sdiff udiff text old ( 161475 ) new ( 170256 )
full compact
output.c (161475) output.c (170256)
1/*
1/*
2 * Copyright (C) 1984-2005 Mark Nudelman
2 * Copyright (C) 1984-2007 Mark Nudelman
3 *
4 * You may distribute under the terms of either the GNU General Public
5 * License or the Less License, as specified in the README file.
6 *
7 * For more information about less, or for information on how to
8 * contact the author, see the README file.
9 */
10

--- 5 unchanged lines hidden (view full) ---

16#include "less.h"
17#if MSDOS_COMPILER==WIN32C
18#include "windows.h"
19#endif
20
21public int errmsgs; /* Count of messages displayed by error() */
22public int need_clr;
23public int final_attr;
3 *
4 * You may distribute under the terms of either the GNU General Public
5 * License or the Less License, as specified in the README file.
6 *
7 * For more information about less, or for information on how to
8 * contact the author, see the README file.
9 */
10

--- 5 unchanged lines hidden (view full) ---

16#include "less.h"
17#if MSDOS_COMPILER==WIN32C
18#include "windows.h"
19#endif
20
21public int errmsgs; /* Count of messages displayed by error() */
22public int need_clr;
23public int final_attr;
24public int at_prompt;
24
25extern int sigs;
26extern int sc_width;
27extern int so_s_width, so_e_width;
28extern int screen_trashed;
29extern int any_display;
30extern int is_tty;
25
26extern int sigs;
27extern int sc_width;
28extern int so_s_width, so_e_width;
29extern int screen_trashed;
30extern int any_display;
31extern int is_tty;
32extern int oldbot;
31
32#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC
33extern int ctldisp;
34extern int nm_fg_color, nm_bg_color;
35extern int bo_fg_color, bo_bg_color;
36extern int ul_fg_color, ul_bg_color;
37extern int so_fg_color, so_bg_color;
38extern int bl_fg_color, bl_bg_color;

--- 328 unchanged lines hidden (view full) ---

367#endif
368 /*
369 * Some versions of flush() write to *ob, so we must flush
370 * when we are still one char from the end of obuf.
371 */
372 if (ob >= &obuf[sizeof(obuf)-1])
373 flush();
374 *ob++ = c;
33
34#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC
35extern int ctldisp;
36extern int nm_fg_color, nm_bg_color;
37extern int bo_fg_color, bo_bg_color;
38extern int ul_fg_color, ul_bg_color;
39extern int so_fg_color, so_bg_color;
40extern int bl_fg_color, bl_bg_color;

--- 328 unchanged lines hidden (view full) ---

369#endif
370 /*
371 * Some versions of flush() write to *ob, so we must flush
372 * when we are still one char from the end of obuf.
373 */
374 if (ob >= &obuf[sizeof(obuf)-1])
375 flush();
376 *ob++ = c;
377 at_prompt = 0;
375 return (c);
376}
377
378/*
379 * Output a string.
380 */
381 public void
382putstr(s)

--- 134 unchanged lines hidden (view full) ---

517{
518 int col = 0;
519 static char return_to_continue[] = " (press RETURN)";
520
521 errmsgs++;
522
523 if (any_display && is_tty)
524 {
378 return (c);
379}
380
381/*
382 * Output a string.
383 */
384 public void
385putstr(s)

--- 134 unchanged lines hidden (view full) ---

520{
521 int col = 0;
522 static char return_to_continue[] = " (press RETURN)";
523
524 errmsgs++;
525
526 if (any_display && is_tty)
527 {
528 if (!oldbot)
529 squish_check();
525 at_exit();
526 clear_bot();
527 at_enter(AT_STANDOUT);
528 col += so_s_width;
529 }
530
531 col += less_printf(fmt, parg);
532

--- 78 unchanged lines hidden --- 		530 at_exit();
531 clear_bot();
532 at_enter(AT_STANDOUT);
533 col += so_s_width;
534 }
535
536 col += less_printf(fmt, parg);
537

--- 78 unchanged lines hidden ---