@@ -1679,10 +1679,64 @@ redata_pos2linecol(redata_t *redata, long pos, int *resline, int *rescol)

 int

 redata_linecol2pos(redata_t *redata, int line, int colrequest, long *pos, int *coldone)

 {

-#warning TODO: XXX Implement this function

-#warning TODO: XXX: Add a parameter so this is like reata_line_inccol (colrequest, coldone) --  maybe also linetrequest linedone? (zed doesn''t let you go to the last line doing a Ctrl+q+l to an arbitrarily large number...)

-#warning TODO: XXX: The extra parameters are super-handy because the main user of this function is Control+Q+L "Go To Line" and we want to go to nearest pos

-        return(-1);

+        long chunkpos,realstart,newpos,curpos,startpos;

+        int startline;

+        int nchunk;

+        rechunk_t *chunk;

+        int i,n;

+        char *ptr;

+        int len;

+        int done;

+        if(redata==NULL || line<0 || colrequest<0)

+                return(-1);

+        /* find line */

+        for(nchunk=0,chunkpos=0,startline=0

+          ;nchunk<redata->sizechunks

+          ;chunkpos+=(chunk!=NULL)?chunk->useddata:0

+            ,startline+=(chunk!=NULL)?chunk->whatin.nlcount:0,nchunk++) {

+                if((chunk=redata->chunks[nchunk])==NULL)

+                        continue;

+                if(!(chunk->whatin_fresh))

+                        redata_whatin_refresh(redata,nchunk);

+                if(line>=startline && line<=(startline+chunk->whatin.nlcount))

+                        break;

+        }

+        if(nchunk>=redata->sizechunks)

+                return(-1); /* line not found */

+        for(i=0;line!=startline && i<chunk->useddata;i++) {

+                if(chunk->data[i]=='\n')

+                        startline++;

+        }

+        if(i>chunk->useddata)

+                return(-1); /* line not found */

+        realstart=chunkpos+i;

+        /* find col */

+        for(n=0,curpos=realstart;n<colrequest;) {

+                if(redata_line_rawinfo(redata,curpos,&startpos,&ptr,&len,NULL)==-1 || len==0)

+                        return(-1); /* couldn't get current line data */

+                done=0;

+                for(i=0;colrequest>0 && i<len && n<=colrequest;i++) {

+                        if(redata_generic_utf8isstartbyte(ptr[i])) {

+                                if(n==colrequest) {

+                                        done=1;

+                                        break;

+                                }

+                                n++;

+                        }

+                        if(ptr[i]=='\n') {

+                                done=1;

+                                break;

+                        }

+                }

+                curpos=startpos+i;

+                if(done)

+                        break;

+        }

+        if(coldone!=NULL)

+                *coldone=n;

+        if(pos!=NULL)

+                *pos=curpos;

+        return(0);

 }

 static char *

@@ -148,7 +148,7 @@ int redata_generic_utf8len(char *ptr, int size);

 char *redata_generic_utf8col(char *ptr, int size, int col);

 /* returns the len in bytes of the character starting at ptr (zero on error)*/

 int redata_generic_utf8charlen(char *ptr, int maxsize);

-/* returns true if it's the forst byte of an UTF char */

+/* returns true if it's the first byte of an UTF char */

 int redata_generic_utf8isstartbyte(int candidate);

@@ -487,8 +487,9 @@ re_processcommand(re_t *re)

         if(strcmp(re->command,COMMAND_GOTOLINE)==0) {

                 int line;

                 long pos;

-                line=atoi(re->commandbuf);

-                if(redata_linecol2pos(re->data,line,0,&pos,NULL)==-1) {

+                line=atoi(re->commandbuf)-1;

+                line=(line<0)?0:line;

+                if(redata_linecol2pos(re->data,line,re->curcol,&pos,NULL)==-1) {

                         re->command=COMMAND_WARNING;

                         snprintf(re->commandbuf,sizeof(re->commandbuf),"Unknown line");

                         re->commandbuf[sizeof(re->commandbuf)-1]='\0';

@@ -496,13 +497,9 @@ re_processcommand(re_t *re)

                         return(-1);

                 }

                 re->cursorpos=pos;

-                re->curcol=0;

                 re->curline=line;

-                re->origincol=0;

-                if((re->originline+re->maxrow)<line)

-                        re->originline=line-re->maxrow;

-                if(line<re->originline)

-                        re->originline=line;

+                /* position the line in the center of viewport */

+                re->originline=line-(re->maxrow/2);

                 re->headerdirty=1;

                 re->contentsdirty=1;

         }

@@ -669,7 +666,8 @@ re_drawheader_editing(re_t *re)

         if(redata_pos2linecol(re->data,re->cursorpos,&line,&col)==-1)

                 line=col=-1;

         reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,COLOR_STATUSBG);

-        reui_printf(re->ui,0,0,COLOR_STATUSFG,"File: %s Line:%i (%i) Col:%i (%i) Pos:%li",re->filename,re->curline,line,re->curcol,col,re->cursorpos);

+        /* for the user, lines start at 0 (internally they start at 0) */

+        reui_printf(re->ui,0,0,COLOR_STATUSFG,"File: %s Line:%i (%i) Col:%i (%i) Pos:%li",re->filename,re->curline+1,line+1,re->curcol+1,col+1,re->cursorpos);

         re->headerdirty=0;

         re->ui->rendererdirty=1;

         return(0);