Implement ESC-G command.

ch.c

@@ -528,6 +528,32 @@ ch_end_seek()
  return (0);
 }
 
+/*
+ * Seek to the last position in the file that is currently buffered.
+ */
+ public int
+ch_end_buffer_seek()
+{
+ register struct buf *bp;
+ register struct bufnode *bn;
+ POSITION buf_pos;
+ POSITION end_pos;
+
+ if (thisfile == NULL || (ch_flags & CH_CANSEEK))
+ return (ch_end_seek());
+
+ end_pos = 0;
+ FOR_BUFS(bn)
+ {
+ bp = bufnode_buf(bn);
+ buf_pos = (bp->block * LBUFSIZE) + bp->datasize;
+ if (buf_pos > end_pos)
+ end_pos = buf_pos;
+ }
+
+ return (ch_seek(end_pos));
+}
+
 /*
  * Seek to the beginning of the file, or as close to it as we can get.
  * We may not be able to seek there if input is a pipe and the

cmd.h

@@ -59,6 +59,7 @@
 #define A_PREV_TAG 54
 #define A_FILTER 55
 #define A_F_UNTIL_HILITE 56
+#define A_GOEND_BUF 57
 
 #define A_INVALID 100
 #define A_NOACTION 101

command.c

@@ -966,7 +966,7 @@ forw_loop(until_hilite)
  return (A_NOACTION);
 
  cmd_exec();
- jump_forw();
+ jump_forw_buffered();
  curr_len = ch_length();
  highest_hilite = until_hilite ? curr_len : NULL_POSITION;
  ignore_eoi = 1;
@@ -1325,6 +1325,17 @@ commands()
  jump_back(number);
  break;
 
+ case A_GOEND_BUF:
+ /*
+ * Go to line N, default last buffered byte.
+ */
+ cmd_exec();
+ if (number <= 0)
+ jump_forw_buffered();
+ else
+ jump_back(number);
+ break;
+
  case A_GOPOS:
  /*
  * Go to a specified byte position in the file.

decode.c

@@ -98,6 +98,7 @@ static unsigned char cmdtable[] =
  ESC,CONTROL('F'),0, A_F_BRACKET,
  ESC,CONTROL('B'),0, A_B_BRACKET,
  'G',0, A_GOEND,
+ ESC,'G',0, A_GOEND_BUF,
  ESC,'>',0, A_GOEND,
  '>',0, A_GOEND,
  SK(SK_END),0, A_GOEND,

jump.c

@@ -53,6 +53,20 @@ jump_forw()
  }
 }
 
+/*
+ * Jump to the last buffered line in the file.
+ */
+ public void
+jump_forw_buffered()
+{
+ if (ch_end_buffer_seek())
+ {
+ error("Cannot seek to end of buffers", NULL_PARG);
+ return;
+ }
+ jump_line_loc(ch_tell(), sc_height-1);
+}
+
 /*
  * Jump to line n in the file.
  */

less.nro.VER

@@ -121,6 +121,9 @@ Go to line N in the file, default the end of the file.
 (Warning: this may be slow if N is large,
 or if N is not specified and
 standard input, rather than a file, is being read.)
+.IP "ESC-G"
+Same as G, except if no number N is specified and the input is standard input,
+goes to the last line which is currently buffered.
 .IP "p or %"
 Go to a position N percent into the file.
 N should be between 0 and 100, and may contain a decimal point.

lesskey.c

@@ -113,6 +113,7 @@ struct cmdname cmdnames[] =
  { "forw-search", A_F_SEARCH },
  { "forw-window", A_F_WINDOW },
  { "goto-end", A_GOEND },
+ { "goto-end-buffered", A_GOEND_BUF },
  { "goto-line", A_GOLINE },
  { "goto-mark", A_GOMARK },
  { "help", A_HELP },

lesskey.nro.VER

@@ -190,6 +190,7 @@ default command keys used by less:
  \ee> goto-end 
  > goto-end 
  \eke goto-end
+ \eeG goto-end-buffered
  = status 
  ^G status 
  :f status 

optfunc.c

@@ -36,6 +36,7 @@ extern char *prproto[];
 extern char *eqproto;
 extern char *hproto;
 extern char *wproto;
+extern char *every_first_cmd;
 extern IFILE curr_ifile;
 extern char version[];
 extern int jump_sline;