about summary refs log tree commit diff stats
path: root/WWW
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>1998-09-28 09:23:04 -0400
committerThomas E. Dickey <dickey@invisible-island.net>1998-09-28 09:23:04 -0400
commit6b6388d0c6a89daaa3c95fc3aa54e38e71c7cc15 (patch)
tree58386dcfaa0608ea61ec408a14c53ca812dfbc74 /WWW
parentd719889296edc6adf9987246e9c1181a995fdb85 (diff)
downloadlynx-snapshots-6b6388d0c6a89daaa3c95fc3aa54e38e71c7cc15.tar.gz
snapshot of project "lynx", label v2-8-1pre_4
Diffstat (limited to 'WWW')
-rw-r--r--WWW/Library/Implementation/HTFormat.c13
-rw-r--r--WWW/Library/Implementation/HTUtils.h2
-rw-r--r--WWW/Library/Implementation/HTVMS_WaisUI.c4
3 files changed, 13 insertions, 6 deletions
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index 899b8640..0a920e0e 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -503,10 +503,15 @@ PRIVATE void HTDisplayPartial NOARGS
 		/* new hypertext document available  */
 	&& ((Newline_partial + display_lines) > NumOfLines_partial)
 		/* current page not complete... */
-	&& ((Newline_partial + display_lines)  < HText_getNumOfLines())) {
-		/*             ^^^^^^^^^^^^^
-		 * and we MAY display the page in one stage:
-		 * incremental rendering of the first page reported annoying
+	&& ((Newline_partial +
+		((min_lines_partial < 1) ?
+		display_lines : min_lines_partial))
+		< HText_getNumOfLines())) {
+		/*
+		 * and we MAY display certain amount of lines (from lynx.cfg)
+		 * 
+		 * By default, wait for complete screen:
+		 * incremental rendering of the first screen reported annoying
 		 * on slow network connection.
 		 */
 	    NumOfLines_partial = HText_getNumOfLines();
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index a4afa28b..2649bc62 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -323,8 +323,10 @@ Sucess (>=0) and failure (<0) codes
 #ifndef va_arg
 #ifdef __STDC__
 #include <stdarg.h>
+#define LYva_start(ap,format) va_start(ap,format)
 #else
 #include <varargs.h>
+#define LYva_start(ap,format) va_start(ap)
 #endif
 #endif
 
diff --git a/WWW/Library/Implementation/HTVMS_WaisUI.c b/WWW/Library/Implementation/HTVMS_WaisUI.c
index 6551bc60..fda6ef14 100644
--- a/WWW/Library/Implementation/HTVMS_WaisUI.c
+++ b/WWW/Library/Implementation/HTVMS_WaisUI.c
@@ -1533,7 +1533,7 @@ makeBitMap(unsigned long numBits, ...)
   long i,j;
   bit_map* bm = NULL;
 
-  va_start(ap,numBits);
+  LYva_start(ap,numBits);
 
   bm = (bit_map*)s_malloc((size_t)sizeof(bit_map));
   bm->size = (unsigned long)(ceil((double)numBits / bitsPerByte));
@@ -2266,7 +2266,7 @@ panic(char *format, ...)
   va_list ap;			/* the variable arguments */
 
   fprintf(stderr,PANIC_HEADER);
-  va_start(ap, format);		/* init ap */
+  LYva_start(ap, format);	/* init ap */
   vfprintf(stderr,format,ap);	/* print the contents */
   va_end(ap);			/* free ap */
   fflush(stderr);