@@ -29,7 +29,8 @@

 #define COMMANDBUFSIZE 1024

 #define COMMAND_WARNING "(!)"

-#define COMMAND_GOTOLINE "Go to line: "

+#define COMMAND_GOTOLINE "Go to line:"

+#define COMMAND_SEARCHFORWARD "Search:"

 #define COMMAND_QUESTION "(?)"

 #define COMMAND_EXIT "Exit"

@@ -58,6 +59,7 @@ typedef struct re_t {

         int command_first_key;

         char *command;

         char commandbuf[COMMANDBUFSIZE];

+        char cachelastsearch[COMMANDBUFSIZE];

         question_t *question;

         int showingwarning;

         int ignorenkeys;

@@ -621,6 +623,22 @@ fprintf(stderr,"re_processkey(): received Control+z\n");

                 re_fixorigin(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

+        } else if(event->key.keysym.sym==SDLK_l && (SDL_GetModState()&KMOD_CTRL)!=0 && re->cachelastsearch[0]!='\0') {

+                long newpos;

+fprintf(stderr,"re_processkey(): received Control+l\n");

+                /* search next (forward) */

+                if((newpos=redata_searchforward(re->data,re->cursorpos+1,re->cachelastsearch,strlen(re->cachelastsearch)))==-1) {

+                        re->command=COMMAND_WARNING;

+                        snprintf(re->commandbuf,sizeof(re->commandbuf),"String not found");

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

+                        re->headerdirty=1;

+                        return(-1);

+                }

+                re->cursorpos=newpos;

+                redata_pos2linecol(re->data,re->cursorpos,&(re->curline),&(re->curcol));

+                re_fixorigin_center(re);

+                re->headerdirty=1;

+                re->contentsdirty=1;

         }

         return(0);

 }

@@ -638,6 +656,11 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

                 re->command=COMMAND_GOTOLINE;

                 re->commandbuf[0]='\0';

                 re->headerdirty=1;

+        } else if(re->command_first_key=='q' && event->key.keysym.sym==SDLK_f) {

+                re->command=COMMAND_SEARCHFORWARD;

+                strncpy(re->commandbuf,re->cachelastsearch,sizeof(re->commandbuf));

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

+                re->headerdirty=1;

         } else if(re->command_first_key=='k' && event->key.keysym.sym==SDLK_q) {

                 re->command=COMMAND_EXIT;

                 re->commandbuf[0]='\0';

@@ -717,6 +740,22 @@ re_processcommand(re_t *re)

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

                 re->headerdirty=1;

                 re->contentsdirty=1;

+        } else if(strcmp(re->command,COMMAND_SEARCHFORWARD)==0) {

+                long newpos;

+                if((newpos=redata_searchforward(re->data,re->cursorpos,re->commandbuf,strlen(re->commandbuf)))==-1) {

+                        re->command=COMMAND_WARNING;

+                        snprintf(re->commandbuf,sizeof(re->commandbuf),"String not found");

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

+                        re->headerdirty=1;

+                        return(-1);

+                }

+                strncpy(re->cachelastsearch,re->commandbuf,sizeof(re->cachelastsearch));

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

+                re->cursorpos=newpos;

+                redata_pos2linecol(re->data,re->cursorpos,&(re->curline),&(re->curcol));

+                re_fixorigin_center(re);

+                re->headerdirty=1;

+                re->contentsdirty=1;

         } else if(strcmp(re->command,COMMAND_QUESTION)==0) {

                 /* validate reply */

                 if(!(atoi(re->commandbuf)>0 && atoi(re->commandbuf)<=re->question->nopts)) {