[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
LYNX-DEV installing lynx2-6 on aix 4.2
|
From: |
Dale Summers |
|
Subject: |
LYNX-DEV installing lynx2-6 on aix 4.2 |
|
Date: |
Wed, 18 Dec 1996 16:11:47 -0600 (CST) |
When I installed lynx2-6 on aix 4.2, I got errors compiling files
GridText.c and LYMainLoop.c. Here is one error:
124 | struct _HText {
125 | HTParentAnchor * node_anchor;
126 | HTLine * last_line;
127 | int lines; /* Number of them */
127 + int cur_term-> _c3; /* Number
of them */
"GridText.c", line 127.33: 1506-277 (S) Syntax error: possible missing ';' or
','?
"GridText.c", line 127.33: 1506-046 (S) Syntax error.
128 | int chars; /* Number of them */
I think this error is due to something in aix 4.2 curses.h.
GridText.c compiled after I changed 'lines' to 'linesDale' and 'tab'
to 'tabDale'. LYMainLoop.c compiled after I changed 'newline' to
'newlineDale'. I edited GridText.c and LYMainLoop.c manually. I
completed the make of lynx2-6. Lynx2-6 works better than lynx2.4.
Results of 'diff -c GridText.c GridText.c.save' and
'diff -c LYMainLoop.c LYMainLoop.c.save' follow.
Dale Summers
address@hidden
telephone 701 231 8631
Information Technology Services
North Dakota State University
*** GridText.c Mon Dec 16 15:38:56 1996
--- GridText.c.save Mon Dec 16 16:43:51 1996
***************
*** 123,129 ****
struct _HText {
HTParentAnchor * node_anchor;
HTLine * last_line;
! int linesDale; /* Number of them */
int chars; /* Number of them */
TextAnchor * first_anchor; /* Singly linked list */
TextAnchor * last_anchor;
--- 123,129 ----
struct _HText {
HTParentAnchor * node_anchor;
HTLine * last_line;
! int lines; /* Number of them */
int chars; /* Number of them */
TextAnchor * first_anchor; /* Singly linked list */
TextAnchor * last_anchor;
***************
*** 244,250 ****
outofmem(__FILE__, "HText_New");
line->next = line->prev = line;
line->offset = line->size = 0;
! self->linesDale = self->chars = 0;
self->first_anchor = self->last_anchor = NULL;
self->style = &default_style;
self->top_of_screen = 0;
--- 244,250 ----
outofmem(__FILE__, "HText_New");
line->next = line->prev = line;
line->offset = line->size = 0;
! self->lines = self->chars = 0;
self->first_anchor = self->last_anchor = NULL;
self->style = &default_style;
self->top_of_screen = 0;
***************
*** 399,409 ****
* Free the tabs list. - FM
*/
if (self->tabs) {
! HTTabID * tabDale = NULL;
HTList * cur = self->tabs;
! while (NULL != (tabDale = (HTTabID *)HTList_nextObject(cur))) {
! FREE(tabDale->name);
}
HTList_delete(self->tabs);
}
--- 399,409 ----
* Free the tabs list. - FM
*/
if (self->tabs) {
! HTTabID * tab = NULL;
HTList * cur = self->tabs;
! while (NULL != (tab = (HTTabID *)HTList_nextObject(cur))) {
! FREE(tab->name);
}
HTList_delete(self->tabs);
}
***************
*** 557,563 ****
/*
* Generate the page indicator (percent) string.
*/
! if ((text->linesDale + 1) > (display_lines)) {
/*
* In a small attempt to correct the number of pages counted....
* GAB 07-14-94
--- 557,563 ----
/*
* Generate the page indicator (percent) string.
*/
! if ((text->lines + 1) > (display_lines)) {
/*
* In a small attempt to correct the number of pages counted....
* GAB 07-14-94
***************
*** 566,575 ****
* FM 02-08-95
*/
int total_pages =
! (((text->linesDale + 1) + (display_lines - 1))/(display_lines));
int start_of_last_page =
! ((text->linesDale + 1) < display_lines) ? 0 :
! ((text->linesDale + 1) - display_lines);
sprintf(percent, " (p%d of %d)",
((text->top_of_screen >= start_of_last_page) ?
--- 566,575 ----
* FM 02-08-95
*/
int total_pages =
! (((text->lines + 1) + (display_lines - 1))/(display_lines));
int start_of_last_page =
! ((text->lines + 1) < display_lines) ? 0 :
! ((text->lines + 1) - display_lines);
sprintf(percent, " (p%d of %d)",
((text->top_of_screen >= start_of_last_page) ?
***************
*** 656,670 ****
}
tmp[0] = tmp[1] = tmp[2] = '\0';
! last_screen = text->linesDale - (display_lines-2);
line = text->last_line->prev;
/*
* Constrain the line number to be within the document.
*/
! if (text->linesDale < (display_lines))
line_number = 0;
! else if (line_number > text->linesDale)
line_number = last_screen;
else if (line_number < 0)
line_number = 0;
--- 656,670 ----
}
tmp[0] = tmp[1] = tmp[2] = '\0';
! last_screen = text->lines - (display_lines-2);
line = text->last_line->prev;
/*
* Constrain the line number to be within the document.
*/
! if (text->lines < (display_lines))
line_number = 0;
! else if (line_number > text->lines)
line_number = last_screen;
else if (line_number < 0)
line_number = 0;
***************
*** 963,969 ****
if (line == NULL)
outofmem(__FILE__, "split_line");
! text->linesDale++;
previous->next->prev = line;
line->prev = previous;
--- 963,969 ----
if (line == NULL)
outofmem(__FILE__, "split_line");
! text->lines++;
previous->next->prev = line;
line->prev = previous;
***************
*** 1455,1461 ****
* Tabs.
*/
if (ch == '\t') {
! HTTabStop * tabDale;
int target; /* Where to tab to */
int here;
--- 1455,1461 ----
* Tabs.
*/
if (ch == '\t') {
! HTTabStop * tab;
int target; /* Where to tab to */
int here;
***************
*** 1470,1483 ****
here = (((int)line->size + (int)line->offset) + indent)
- ctrl_chars_on_this_line; /* Consider special chars GAB */
if (style->tabs) { /* Use tab table */
! for (tabDale = style->tabs;
! tabDale->position <= here;
! tabDale++)
! if (!tabDale->position) {
new_line(text);
return;
}
! target = tabDale->position;
} else if (text->in_line_1) { /* Use 2nd indent */
if (here >= (int)style->leftIndent) {
new_line(text); /* wrap */
--- 1470,1483 ----
here = (((int)line->size + (int)line->offset) + indent)
- ctrl_chars_on_this_line; /* Consider special chars GAB */
if (style->tabs) { /* Use tab table */
! for (tab = style->tabs;
! tab->position <= here;
! tab++)
! if (!tab->position) {
new_line(text);
return;
}
! target = tab->position;
} else if (text->in_line_1) { /* Use 2nd indent */
if (here >= (int)style->leftIndent) {
new_line(text); /* wrap */
***************
*** 1762,1768 ****
/*
* Remove the blank lines at the end of document.
*/
! while (text->last_line->data[0] == '\0' && text->linesDale > 2) {
HTLine *next_to_the_last_line;
if (TRACE)
--- 1762,1768 ----
/*
* Remove the blank lines at the end of document.
*/
! while (text->last_line->data[0] == '\0' && text->lines > 2) {
HTLine *next_to_the_last_line;
if (TRACE)
***************
*** 1776,1782 ****
line_ptr->prev = next_to_the_last_line;
FREE(text->last_line);
text->last_line = next_to_the_last_line;
! text->linesDale--;
if (TRACE)
fprintf(stderr, "GridText: New bottom line: %s\n",
--- 1776,1782 ----
line_ptr->prev = next_to_the_last_line;
FREE(text->last_line);
text->last_line = next_to_the_last_line;
! text->lines--;
if (TRACE)
fprintf(stderr, "GridText: New bottom line: %s\n",
***************
*** 1838,1844 ****
* lines, then start the highlighting on the next line.
*/
if (anchor_ptr->line_pos >= strlen(line_ptr->data) &&
! cur_line < text->linesDale) {
anchor_ptr->start++;
if (TRACE)
--- 1838,1844 ----
* lines, then start the highlighting on the next line.
*/
if (anchor_ptr->line_pos >= strlen(line_ptr->data) &&
! cur_line < text->lines) {
anchor_ptr->start++;
if (TRACE)
***************
*** 1974,1980 ****
*/
PUBLIC int HText_getNumOfLines NOARGS
{
! return(HTMainText->linesDale);
}
/* HText_getTitle returns the title of the
--- 1974,1980 ----
*/
PUBLIC int HText_getNumOfLines NOARGS
{
! return(HTMainText->lines);
}
/* HText_getTitle returns the title of the
***************
*** 2003,2013 ****
* HText_LinksInLines returns the number of links in the
* 'lines' number of lines beginning with 'line_num'-1. - FM
*/
! PUBLIC int HText_LinksInLines ARGS3(HText *,text, int,line_num, int,linesDale)
{
int total = 0;
int start = (line_num - 1);
! int end = (start + linesDale);
TextAnchor *Anchor_ptr = NULL;
if (!text)
--- 2003,2013 ----
* HText_LinksInLines returns the number of links in the
* 'lines' number of lines beginning with 'line_num'-1. - FM
*/
! PUBLIC int HText_LinksInLines ARGS3(HText *,text, int,line_num, int,lines)
{
int total = 0;
int start = (line_num - 1);
! int end = (start + lines);
TextAnchor *Anchor_ptr = NULL;
if (!text)
***************
*** 2051,2057 ****
{
HText * text = HTMainText;
! return ((text->top_of_screen + display_lines) < text->linesDale+1);
}
/* Scroll actions
--- 2051,2057 ----
{
HText * text = HTMainText;
! return ((text->top_of_screen + display_lines) < text->lines+1);
}
/* Scroll actions
***************
*** 2073,2079 ****
PUBLIC void HText_scrollBottom ARGS1(HText *,text)
{
! display_page(text, text->linesDale - display_lines, "");
}
--- 2073,2079 ----
PUBLIC void HText_scrollBottom ARGS1(HText *,text)
{
! display_page(text, text->lines - display_lines, "");
}
***************
*** 2264,2270 ****
PUBLIC int HText_getLines ARGS1(HText *,text)
{
! return text->linesDale;
}
PUBLIC HTAnchor * HText_linkSelTo ARGS2(HText *,me, HTAnchor *,anchor)
--- 2264,2270 ----
PUBLIC int HText_getLines ARGS1(HText *,text)
{
! return text->lines;
}
PUBLIC HTAnchor * HText_linkSelTo ARGS2(HText *,me, HTAnchor *,anchor)
***************
*** 2867,2873 ****
*/
PUBLIC void HText_setTabID ARGS2(HText *,text, CONST char *,name)
{
! HTTabID * tabDale = NULL;
HTList * cur = text->tabs;
HTList * last = NULL;
--- 2867,2873 ----
*/
PUBLIC void HText_setTabID ARGS2(HText *,text, CONST char *,name)
{
! HTTabID * tab = NULL;
HTList * cur = text->tabs;
HTList * last = NULL;
***************
*** 2877,2897 ****
if (!cur) {
cur = text->tabs = HTList_new();
} else {
! while (NULL != (tabDale = (HTTabID *)HTList_nextObject(cur))) {
! if (tabDale->name && !strcmp(tabDale->name, name))
return; /* Already set. Keep the first value. */
last = cur;
}
cur = last;
}
! if (!tabDale) { /* New name. Create a new node */
! tabDale = (HTTabID *)calloc(1, sizeof(HTTabID));
! if (tabDale == NULL)
outofmem(__FILE__, "HText_setTabID");
! HTList_addObject(cur, tabDale);
! StrAllocCopy(tabDale->name, name);
}
! tabDale->column = HText_getCurrentColumn(text);
return;
}
--- 2877,2897 ----
if (!cur) {
cur = text->tabs = HTList_new();
} else {
! while (NULL != (tab = (HTTabID *)HTList_nextObject(cur))) {
! if (tab->name && !strcmp(tab->name, name))
return; /* Already set. Keep the first value. */
last = cur;
}
cur = last;
}
! if (!tab) { /* New name. Create a new node */
! tab = (HTTabID *)calloc(1, sizeof(HTTabID));
! if (tab == NULL)
outofmem(__FILE__, "HText_setTabID");
! HTList_addObject(cur, tab);
! StrAllocCopy(tab->name, name);
}
! tab->column = HText_getCurrentColumn(text);
return;
}
***************
*** 2898,2913 ****
PUBLIC int HText_getTabIDColumn ARGS2(HText *,text, CONST char *,name)
{
int column = 0;
! HTTabID * tabDale;
HTList * cur = text->tabs;
if (text && name && *name && cur) {
! while (NULL != (tabDale = (HTTabID *)HTList_nextObject(cur))) {
! if (tabDale->name && !strcmp(tabDale->name, name))
break;
}
! if (tabDale)
! column = tabDale->column;
}
return column;
}
--- 2898,2913 ----
PUBLIC int HText_getTabIDColumn ARGS2(HText *,text, CONST char *,name)
{
int column = 0;
! HTTabID * tab;
HTList * cur = text->tabs;
if (text && name && *name && cur) {
! while (NULL != (tab = (HTTabID *)HTList_nextObject(cur))) {
! if (tab->name && !strcmp(tab->name, name))
break;
}
! if (tab)
! column = tab->column;
}
return column;
}
*** LYMainLoop.c Mon Dec 16 15:49:48 1996
--- LYMainLoop.c.save Mon Dec 16 16:48:37 1996
***************
*** 104,110 ****
{
int c=0, real_c=0, old_c=0, cmd, arrowup=FALSE, show_help=FALSE;
int lines_in_file= -1;
! int newlineDale=0;
char prev_target[512];
char user_input_buffer[1024];
char *owner_address=NULL; /* holds the responsible owner's address */
--- 104,110 ----
{
int c=0, real_c=0, old_c=0, cmd, arrowup=FALSE, show_help=FALSE;
int lines_in_file= -1;
! int newline=0;
char prev_target[512];
char user_input_buffer[1024];
char *owner_address=NULL; /* holds the responsible owner's address */
***************
*** 477,498 ****
}
/*
! * Set newlineDale to the saved line. It contains the
* line the user was on if s/he has been in the file
* before, or it is 1 if this is a new file.
*/
! newlineDale = newdoc.line;
/*
* If we are going to a target line,
* override any www_search line result.
*/
! if (newlineDale > 1)
www_search_result = -1;
/*
* Make sure curdoc.line will not be equal
! * to newlineDale, so we get a redraw.
*/
curdoc.line = -1;
--- 477,498 ----
}
/*
! * Set newline to the saved line. It contains the
* line the user was on if s/he has been in the file
* before, or it is 1 if this is a new file.
*/
! newline = newdoc.line;
/*
* If we are going to a target line,
* override any www_search line result.
*/
! if (newline > 1)
www_search_result = -1;
/*
* Make sure curdoc.line will not be equal
! * to newline, so we get a redraw.
*/
curdoc.line = -1;
***************
*** 556,562 ****
/* This was a WWW search, set the line
* to the result of the search
*/
! newlineDale = www_search_result;
www_search_result = -1; /* reset */
more = HText_canScrollDown();
}
--- 556,562 ----
/* This was a WWW search, set the line
* to the result of the search
*/
! newline = www_search_result;
www_search_result = -1; /* reset */
more = HText_canScrollDown();
}
***************
*** 630,636 ****
}
}
! /* if the curdoc.line is different than newlineDale then there must
* have been a change since last update. Run showpage.
* showpage will put a fresh screen of text out.
* If this is a WWW document then use the
--- 630,636 ----
}
}
! /* if the curdoc.line is different than newline then there must
* have been a change since last update. Run showpage.
* showpage will put a fresh screen of text out.
* If this is a WWW document then use the
***************
*** 637,647 ****
* WWW routine HText_pageDisplay to put the page on
* the screen
*/
! if (curdoc.line != newlineDale) {
refresh_screen = FALSE;
! HText_pageDisplay(newlineDale, prev_target);
#ifdef DIRED_SUPPORT
if (lynx_edit_mode && nlinks > 0 && tagged != NULL)
--- 637,647 ----
* WWW routine HText_pageDisplay to put the page on
* the screen
*/
! if (curdoc.line != newline) {
refresh_screen = FALSE;
! HText_pageDisplay(newline, prev_target);
#ifdef DIRED_SUPPORT
if (lynx_edit_mode && nlinks > 0 && tagged != NULL)
***************
*** 651,657 ****
* info below this page
*/
more = HText_canScrollDown();
! curdoc.line = newlineDale = HText_getTopOfScreen()+1;
lines_in_file = HText_getNumOfLines();
if (HText_getTitle()) {
--- 651,657 ----
* info below this page
*/
more = HText_canScrollDown();
! curdoc.line = newline = HText_getTopOfScreen()+1;
lines_in_file = HText_getNumOfLines();
if (HText_getTitle()) {
***************
*** 676,688 ****
show_help = FALSE; /* reset */
newdoc.line = 1;
newdoc.link = 0;
! curdoc.line = newlineDale; /* set */
}
/* refesh the screen if neccessary */
if (refresh_screen) {
clear();
! HText_pageDisplay(newlineDale, prev_target);
#ifdef DIRED_SUPPORT
if (lynx_edit_mode && nlinks > 0 && tagged != NULL)
--- 676,688 ----
show_help = FALSE; /* reset */
newdoc.line = 1;
newdoc.link = 0;
! curdoc.line = newline; /* set */
}
/* refesh the screen if neccessary */
if (refresh_screen) {
clear();
! HText_pageDisplay(newline, prev_target);
#ifdef DIRED_SUPPORT
if (lynx_edit_mode && nlinks > 0 && tagged != NULL)
***************
*** 1238,1244 ****
case LYK_NEXT_PAGE: /* next page */
if (more) {
! newlineDale += display_lines;
} else if (curdoc.link < nlinks-1) {
highlight(OFF,curdoc.link);
curdoc.link = nlinks-1; /* put on last link */
--- 1238,1244 ----
case LYK_NEXT_PAGE: /* next page */
if (more) {
! newline += display_lines;
} else if (curdoc.link < nlinks-1) {
highlight(OFF,curdoc.link);
curdoc.link = nlinks-1; /* put on last link */
***************
*** 1250,1257 ****
break;
case LYK_PREV_PAGE: /* page up */
! if (newlineDale > 1) {
! newlineDale -= display_lines;
} else if (curdoc.link > 0) {
highlight(OFF,curdoc.link);
curdoc.link = 0; /* put on last link */
--- 1250,1257 ----
break;
case LYK_PREV_PAGE: /* page up */
! if (newline > 1) {
! newline -= display_lines;
} else if (curdoc.link > 0) {
highlight(OFF,curdoc.link);
curdoc.link = 0; /* put on last link */
***************
*** 1263,1275 ****
break;
case LYK_UP_TWO:
! if (newlineDale > 1) {
! newlineDale -= 2;
if (nlinks > 0 && curdoc.link > -1) {
if (links[curdoc.link].ly <= (display_lines - 2)) {
newdoc.link = curdoc.link +
HText_LinksInLines(HTMainText,
! newlineDale, 2);
} else {
arrowup = TRUE;
}
--- 1263,1275 ----
break;
case LYK_UP_TWO:
! if (newline > 1) {
! newline -= 2;
if (nlinks > 0 && curdoc.link > -1) {
if (links[curdoc.link].ly <= (display_lines - 2)) {
newdoc.link = curdoc.link +
HText_LinksInLines(HTMainText,
! newline, 2);
} else {
arrowup = TRUE;
}
***************
*** 1283,1289 ****
case LYK_DOWN_TWO:
if (more) {
! newlineDale += 2;
if (nlinks > 0 && curdoc.link > -1 &&
links[curdoc.link].ly > 2) {
int i;
--- 1283,1289 ----
case LYK_DOWN_TWO:
if (more) {
! newline += 2;
if (nlinks > 0 && curdoc.link > -1 &&
links[curdoc.link].ly > 2) {
int i;
***************
*** 1299,1311 ****
break;
case LYK_UP_HALF:
! if (newlineDale > 1) {
! newlineDale -= display_lines/2;
if (nlinks > 0 && curdoc.link > -1) {
if (links[curdoc.link].ly <= (display_lines/2)) {
newdoc.link = curdoc.link +
HText_LinksInLines(HTMainText,
! newlineDale,
(display_lines/2));
} else {
arrowup = TRUE;
--- 1299,1311 ----
break;
case LYK_UP_HALF:
! if (newline > 1) {
! newline -= display_lines/2;
if (nlinks > 0 && curdoc.link > -1) {
if (links[curdoc.link].ly <= (display_lines/2)) {
newdoc.link = curdoc.link +
HText_LinksInLines(HTMainText,
! newline,
(display_lines/2));
} else {
arrowup = TRUE;
***************
*** 1320,1326 ****
case LYK_DOWN_HALF:
if (more) {
! newlineDale += (display_lines/2);
if (nlinks > 0 && curdoc.link > -1 &&
links[curdoc.link].ly > display_lines/2) {
int i;
--- 1320,1326 ----
case LYK_DOWN_HALF:
if (more) {
! newline += (display_lines/2);
if (nlinks > 0 && curdoc.link > -1 &&
links[curdoc.link].ly > display_lines/2) {
int i;
***************
*** 1344,1350 ****
case LYK_HOME:
if (curdoc.line > 1)
! newlineDale = 1;
else {
cmd = LYK_PREV_PAGE;
goto new_cmd;
--- 1344,1350 ----
case LYK_HOME:
if (curdoc.line > 1)
! newline = 1;
else {
cmd = LYK_PREV_PAGE;
goto new_cmd;
***************
*** 1353,1359 ****
case LYK_END:
if (more) {
! newlineDale = MAXINT; /* go to end of file */
arrowup = TRUE; /* position on last link */
} else {
cmd = LYK_NEXT_PAGE;
--- 1353,1359 ----
case LYK_END:
if (more) {
! newline = MAXINT; /* go to end of file */
arrowup = TRUE; /* position on last link */
} else {
cmd = LYK_NEXT_PAGE;
***************
*** 1366,1372 ****
highlight(OFF, curdoc.link); /* unhighlight the current link
*/
curdoc.link--;
! } else if (!more && curdoc.link==0 && newlineDale==1) { /* at the
top of list */
/* if there is only one page of data and the user
* goes off the top, then just move the cursor to
* last link on the page
--- 1366,1372 ----
highlight(OFF, curdoc.link); /* unhighlight the current link
*/
curdoc.link--;
! } else if (!more && curdoc.link==0 && newline==1) { /* at the top
of list */
/* if there is only one page of data and the user
* goes off the top, then just move the cursor to
* last link on the page
***************
*** 1376,1382 ****
} else if (curdoc.line > 1) { /* previous page */
/* go back to the previous page */
! newlineDale -= (display_lines);
arrowup = TRUE;
} else if (old_c != real_c) {
--- 1376,1382 ----
} else if (curdoc.line > 1) { /* previous page */
/* go back to the previous page */
! newline -= (display_lines);
arrowup = TRUE;
} else if (old_c != real_c) {
***************
*** 1415,1426 ****
* At the bottom of list and there is only one page.
* Move to the top link on the page.
*/
! } else if (!more && newlineDale == 1 && curdoc.link == nlinks-1) {
highlight(OFF,curdoc.link);
curdoc.link = 0;
} else if (more) { /* next page */
! newlineDale += (display_lines);
} else if (old_c != real_c) {
old_c = real_c;
--- 1415,1426 ----
* At the bottom of list and there is only one page.
* Move to the top link on the page.
*/
! } else if (!more && newline == 1 && curdoc.link == nlinks-1) {
highlight(OFF,curdoc.link);
curdoc.link = 0;
} else if (more) { /* next page */
! newline += (display_lines);
} else if (old_c != real_c) {
old_c = real_c;
***************
*** 1442,1452 ****
highlight(OFF, curdoc.link);
curdoc.link = newlink;
#ifdef NOTDEFINED
! } else if (!more && newlineDale == 1 && curdoc.link == 0) {
highlight(OFF, curdoc.link);
curdoc.link = (nlinks-1);
} else if (more) { /* next page */
! newlineDale += (display_lines);
}
#else
} else if (old_c != real_c) {
--- 1442,1452 ----
highlight(OFF, curdoc.link);
curdoc.link = newlink;
#ifdef NOTDEFINED
! } else if (!more && newline == 1 && curdoc.link == 0) {
highlight(OFF, curdoc.link);
curdoc.link = (nlinks-1);
} else if (more) { /* next page */
! newline += (display_lines);
}
#else
} else if (old_c != real_c) {
***************
*** 1460,1472 ****
/* at the bottom of list and there is only one page
* move to the top link on the page
*/
! } else if (!more && newlineDale == 1 && curdoc.link ==
(nlinks-1)) {
highlight(OFF, curdoc.link);
curdoc.link = 0;
#endif /* NOTDEFINED */
! } else if (curdoc.line > 1 && newlineDale > 1) { /* previous
page */
! newlineDale -= (display_lines);
arrowup = TRUE;
} else if (old_c != real_c) {
--- 1460,1472 ----
/* at the bottom of list and there is only one page
* move to the top link on the page
*/
! } else if (!more && newline == 1 && curdoc.link == (nlinks-1)) {
highlight(OFF, curdoc.link);
curdoc.link = 0;
#endif /* NOTDEFINED */
! } else if (curdoc.line > 1 && newline > 1) { /* previous page */
! newline -= (display_lines);
arrowup = TRUE;
} else if (old_c != real_c) {
***************
*** 1490,1501 ****
curdoc.link = newlink;
#ifdef NOTDEFINED
} else if (!more &&
! newlineDale == 1 && curdoc.link == (nlinks-1)) {
highlight(OFF, curdoc.link);
curdoc.link = 0;
#endif /* NOTDEFINED */
} else if (more) { /* next page */
! newlineDale += (display_lines);
} else if (old_c != real_c) {
old_c = real_c;
_statusline(NO_LINKS_BELOW);
--- 1490,1501 ----
curdoc.link = newlink;
#ifdef NOTDEFINED
} else if (!more &&
! newline == 1 && curdoc.link == (nlinks-1)) {
highlight(OFF, curdoc.link);
curdoc.link = 0;
#endif /* NOTDEFINED */
} else if (more) { /* next page */
! newline += (display_lines);
} else if (old_c != real_c) {
old_c = real_c;
_statusline(NO_LINKS_BELOW);
***************
*** 1506,1517 ****
/* at the bottom of list and there is only one page
* move to the top link on the page
*/
! } else if (!more && newlineDale == 1 && curdoc.link ==
(nlinks-1)) {
highlight(OFF, curdoc.link);
curdoc.link = 0;
#endif /* NOTDEFINED */
} else if (more) { /* next page */
! newlineDale += (display_lines);
} else if (old_c != real_c) {
old_c = real_c;
--- 1506,1517 ----
/* at the bottom of list and there is only one page
* move to the top link on the page
*/
! } else if (!more && newline == 1 && curdoc.link == (nlinks-1)) {
highlight(OFF, curdoc.link);
curdoc.link = 0;
#endif /* NOTDEFINED */
} else if (more) { /* next page */
! newline += (display_lines);
} else if (old_c != real_c) {
old_c = real_c;
***************
*** 2254,2260 ****
StrAllocCopy(curdoc.address, newdoc.address);
StrAllocCopy(newdoc.post_data, curdoc.post_data);
curdoc.line = -1;
! newlineDale = 0;
refresh_screen = TRUE; /* redisplay it */
} else if (use_this_url_instead != NULL) {
/* Got back a redirecting URL. Check it out. */
--- 2254,2260 ----
StrAllocCopy(curdoc.address, newdoc.address);
StrAllocCopy(newdoc.post_data, curdoc.post_data);
curdoc.line = -1;
! newline = 0;
refresh_screen = TRUE; /* redisplay it */
} else if (use_this_url_instead != NULL) {
/* Got back a redirecting URL. Check it out. */
***************
*** 2396,2406 ****
if (curdoc.link < nlinks-1) {
highlight(OFF, curdoc.link);
curdoc.link++;
! } else if (!more && newlineDale==1 && curdoc.link==nlinks-1) {
highlight(OFF,curdoc.link);
curdoc.link = 0;
} else if (more) { /* next page */
! newlineDale += (display_lines);
}
}
break;
--- 2396,2406 ----
if (curdoc.link < nlinks-1) {
highlight(OFF, curdoc.link);
curdoc.link++;
! } else if (!more && newline==1 && curdoc.link==nlinks-1) {
highlight(OFF,curdoc.link);
curdoc.link = 0;
} else if (more) { /* next page */
! newline += (display_lines);
}
}
break;
***************
*** 2470,2476 ****
if (((dir_info.st_mode) & S_IFMT) == S_IFREG) {
strcpy(tmpbuf,cp);
HTUnEscape(tmpbuf);
! if (edit_current_file(tmpbuf,curdoc.link,newlineDale))
{
HTuncache_current_document();
StrAllocCopy(newdoc.address, curdoc.address);
--- 2470,2476 ----
if (((dir_info.st_mode) & S_IFMT) == S_IFREG) {
strcpy(tmpbuf,cp);
HTUnEscape(tmpbuf);
! if (edit_current_file(tmpbuf,curdoc.link,newline))
{
HTuncache_current_document();
StrAllocCopy(newdoc.address, curdoc.address);
***************
*** 2495,2501 ****
} else
#endif /* DIRED_SUPPORT */
if (editor && *editor != '\0') {
! if (edit_current_file(newdoc.address, curdoc.link, newlineDale))
{
HTuncache_current_document();
LYforce_no_cache = TRUE; /*force the document to be
reloaded*/
--- 2495,2501 ----
} else
#endif /* DIRED_SUPPORT */
if (editor && *editor != '\0') {
! if (edit_current_file(newdoc.address, curdoc.link, newline))
{
HTuncache_current_document();
LYforce_no_cache = TRUE; /*force the document to be
reloaded*/
;
; To UNSUBSCRIBE: Send a mail message to address@hidden
; with "unsubscribe lynx-dev" (without the
; quotation marks) on a line by itself.
;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- LYNX-DEV installing lynx2-6 on aix 4.2,
Dale Summers <=