w3m

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/w3m.git/
Log | Files | Refs | README

commit c5dee4480c1821108880be54d09446a5b15e1da5
parent ebdf54af55deddbac75e6eaf04dfe895e68890ea
Author: ukai <ukai>
Date:   Wed, 21 Nov 2001 09:09:10 +0000

[w3m-dev 02472] cleanup CYGWIN macro
From: Tsutomu Okada <okada@furuno.co.jp>

Diffstat:
MChangeLog | 11++++++++++-
Mdisplay.c | 4++--
Mfm.h | 6+++---
Mterms.c | 8++++----
4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,6 +1,15 @@ +2001-11-21 Tsutomu Okada <okada@furuno.co.jp> + + * [w3m-dev 02472] cleanup CYGWIN macro + * display.c (displayBuffer): use __CYGWIN__ macro + * fm.h: ditto + * terms.c (refresh): add condition for isWinConsole which + defined only japanese cygwin environment + 2001-11-21 Akinori Ito <aito@fw.ipsj.or.jp> - * Homepage URLs and author's mail addresses in the documents + * [w3m-dev 02466] + Homepage URLs and author's mail addresses in the documents are changed. 2001-11-21 Fumitoshi UKAI <ukai@debian.or.jp> diff --git a/display.c b/display.c @@ -233,11 +233,11 @@ displayBuffer(Buffer * buf, int mode) scroll(n); } else if (n < 0 && n > -LASTLINE) { -#if defined(CYGWIN) && LANG == JA +#if defined(__CYGWIN__) && LANG == JA move(LASTLINE + n + 1, 0); clrtoeolx(); refresh(); -#endif /* defined(CYGWIN) && LANG == JA */ +#endif /* defined(__CYGWIN__) && LANG == JA */ rscroll(-n); } redrawNLine(buf, n); diff --git a/fm.h b/fm.h @@ -603,12 +603,12 @@ typedef struct http_request { */ extern int LINES, COLS; -#if defined(CYGWIN) && LANG == JA +#if defined(__CYGWIN__) && LANG == JA extern int isWinConsole; #define LASTLINE (LINES-(isWinConsole ? 2 : 1)) -#else /* not defined(CYGWIN) && LANG == JA */ +#else /* not defined(__CYGWIN__) || LANG != JA */ #define LASTLINE (LINES-1) -#endif /* not defined(CYGWIN) && LANG == JA */ +#endif /* not defined(__CYGWIN__) || LANG != JA */ global int Tabstop init(8); global int ShowEffect init(TRUE); diff --git a/terms.c b/terms.c @@ -1089,13 +1089,13 @@ refresh(void) * avoid the scroll, I prohibit to draw character on * (COLS-1,LINES-1). */ -#if !defined( BG_COLOR ) || defined( CYGWIN ) -#ifdef CYGWIN +#if !defined(BG_COLOR) || defined(__CYGWIN__) +#if defined(__CYGWIN__) && LANG == JA if (isWinConsole) -#endif +#endif /* defined(__CYGWIN__) && LANG == JA */ if (line == LINES - 1 && col == COLS - 1) break; -#endif /* not BG_COLOR */ +#endif /* !defined(BG_COLOR) || defined(__CYGWIN__) */ if ((!(pr[col] & S_STANDOUT) && (mode & S_STANDOUT)) || (!(pr[col] & S_UNDERLINE) && (mode & S_UNDERLINE)) || (!(pr[col] & S_BOLD) && (mode & S_BOLD)) ||