Merge branch 'master' of http:https://github.com/gwsw/less

gwsw · Feb 12, 2019 · 27a2e81 · 27a2e81
2 parents 319909f + 0ea425d
commit 27a2e81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/decode.c b/decode.c
@@ -452,7 +452,7 @@ mouse_button_rel(x, y)
 }
 
 /*
- * Read an integer. Return the integer and set *pterm to the terminating char.
+ * Read a decimal integer. Return the integer and set *pterm to the terminating char.
  */
  static int
 getcc_int(pterm)

diff --git a/mark.c b/mark.c
@@ -262,6 +262,7 @@ gomark(c)
  int c;
 {
  struct mark *m;
+ struct scrpos scrpos;
 
  m = getmark(c);
  if (m == NULL)
@@ -278,6 +279,8 @@ gomark(c)
 
  mark_get_ifile(m);
 
+ /* Save scrpos; if it's LASTMARK it could change in edit_ifile. */
+ scrpos = m->m_scrpos;
  if (m->m_ifile != curr_ifile)
  {
  /*
@@ -287,7 +290,7 @@ gomark(c)
  return;
  }
 
- jump_loc(m->m_scrpos.pos, m->m_scrpos.ln);
+ jump_loc(scrpos.pos, scrpos.ln);
 }
 
 /*