diff -ur 2/debian/changelog 3/debian/changelog --- 2/debian/changelog Sun Jun 4 00:03:12 2000 +++ 3/debian/changelog Sun Jun 4 00:04:32 2000 @@ -1,11 +1,17 @@ +w3m (0.1.9-3) frozen unstable; urgency=low + + * Added option to display current line in status. + + -- Kim Oldfield Sat, 3 Jun 2000 23:52:56 +1000 + w3m (0.1.9-2) frozen unstable; urgency=HIGH * security fix: remote exploit diff -ur 2/display.c 3/display.c --- 2/display.c Sun Jun 4 00:03:12 2000 +++ 3/display.c Sun Jun 4 00:04:32 2000 @@ -234,6 +234,9 @@ #else /* not MOUSE */ msg = Sprintf("Viewing <%s> ", cleanup_str(buf->buffername)); #endif /* not MOUSE */ + if (displayCurPos) { + Strcat(msg, Sprintf("[%i/%i] ", buf->currentLine->linenumber, buf->lastLine->linenumber)); + } if (displayLink) { aa = retrieveCurrentAnchor(buf); if (aa) { diff -ur 2/fm.h 3/fm.h --- 2/fm.h Sun Jun 4 00:03:12 2000 +++ 3/fm.h Sun Jun 4 00:04:32 2000 @@ -578,6 +578,7 @@ #endif /* COLOR */ global int confirm_on_quit init(TRUE); global int displayLink init(FALSE); +global int displayCurPos init(FALSE); global int showLineNum init(FALSE); global char *Editor init(DEF_EDITOR); global char *Mailer init(DEF_MAILER); diff -ur 2/rc.c 3/rc.c --- 2/rc.c Sun Jun 4 00:03:12 2000 +++ 3/rc.c Sun Jun 4 00:04:32 2000 @@ -42,6 +42,7 @@ #define CMT_FRAME "₯Υ₯μ‘Ό₯ΰ€ΞΌ«Ζ°Ι½Ό¨" #define CMT_TSELF "target€¬Μ€»ΨΔκ€ΞΎμΉη€Λ_self€ς»ΘΝΡ€Ή€λ" #define CMT_DISPLINK "₯κ₯σ₯―ΐθ€ΞΌ«Ζ°Ι½Ό¨" +#define CMT_DISPCURPOS "Display current line number" #define CMT_MULTICOL "₯Υ₯‘₯€₯λΜΎ€Ξ₯ή₯λ₯Α₯«₯ι₯ΰΙ½Ό¨" #define CMT_COLOR "₯«₯ι‘ΌΙ½Ό¨" #define CMT_B_COLOR "ΚΈ»ϊ€ΞΏ§" @@ -104,6 +105,7 @@ #define CMT_FRAME "Automatic rendering of frame" #define CMT_TSELF "use _self as default target" #define CMT_DISPLINK "Automatic display of link URL" +#define CMT_DISPCURPOS "Display current line number" #define CMT_MULTICOL "Multi-column output of file names" #define CMT_COLOR "Display with color" #define CMT_B_COLOR "Color of normal character" @@ -229,6 +231,7 @@ {"frame", P_CHARINT, PI_ONOFF, (void *) &RenderFrame, CMT_FRAME, NULL}, {"target_self", P_CHARINT, PI_ONOFF, (void *) &TargetSelf, CMT_TSELF, NULL}, {"display_link", P_INT, PI_ONOFF, (void *) &displayLink, CMT_DISPLINK, NULL}, + {"display_curpos", P_INT, PI_ONOFF, (void *) &displayCurPos, CMT_DISPCURPOS, NULL}, {"ext_dirlist", P_INT, PI_ONOFF, (void *) &UseExternalDirBuffer, CMT_EXT_DIRLIST, NULL}, {"dirlist_cmd", P_STRING, PI_TEXT, (void *) &DirBufferCommand, CMT_DIRLIST_CMD, NULL}, {"multicol", P_INT, PI_ONOFF, (void *) &multicolList, CMT_MULTICOL, NULL}, diff -ur 2/rcparams.h 3/rcparams.h --- 2/rcparams.h Fri Apr 21 10:51:59 2000 +++ 3/rcparams.h Sun Jun 4 00:04:32 2000 @@ -7,6 +7,7 @@ global char RenderFrame init(FALSE); global char TargetSelf init(FALSE); global int displayLink init(FALSE); +global int displayCurPos init(FALSE); global int UseExternalDirBuffer init(TRUE); #ifdef __EMX__ global char *DirBufferCommand init("file:///$LIB/dirlist.cmd");