Fix a couple bugs caused by moving call to get_term() later in main().

gwsw · Nov 6, 2023 · 328d3fc · 328d3fc
1 parent cdeab23
commit 328d3fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/main.c b/main.c
@@ -320,8 +320,8 @@ int main(int argc, char *argv[])
  quit(QUIT_OK);
  }
 
- expand_cmd_tables();
  get_term();
+ expand_cmd_tables();
 
 #if EDITOR
  editor = lgetenv("VISUAL");

diff --git a/screen.c b/screen.c
@@ -767,7 +767,7 @@ static char * ltgetstr(char *capname, char **pp)
 /*
  * Get size of the output screen.
  */
-public void scrsize(void)
+static void scrsize(void)
 {
  char *s;
  int sys_height;
@@ -787,7 +787,7 @@ public void scrsize(void)
  sys_width = sys_height = 0;
 
 #if LESSTEST
- if (ttyin_name != NULL)
+ if (0) /* can't test ttyin_name; it is not set yet */
 #endif /*LESSTEST*/
  {
 #if MSDOS_COMPILER==MSOFTC
@@ -906,6 +906,7 @@ public void scrsize(void)
  }
  if (sc_width <= 0)
  sc_width = DEF_SC_WIDTH;
+ calc_jump_sline();
 }
 
 #if MSDOS_COMPILER==MSOFTC