===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-run-shell.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -c -r1.57 -r1.58
*** src/usr.bin/tmux/cmd-run-shell.c	2019/03/08 10:34:20	1.57
--- src/usr.bin/tmux/cmd-run-shell.c	2019/03/12 11:16:50	1.58
***************
*** 1,4 ****
! /* $OpenBSD: cmd-run-shell.c,v 1.57 2019/03/08 10:34:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-run-shell.c,v 1.58 2019/03/12 11:16:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 60,65 ****
--- 60,66 ----
  	struct cmd_run_shell_data	*cdata = job_get_data(job);
  	struct window_pane		*wp = NULL;
  	struct cmd_find_state		 fs;
+ 	struct window_mode_entry	*wme;
  
  	if (cdata->wp_id != -1)
  		wp = window_pane_find_by_id(cdata->wp_id);
***************
*** 75,84 ****
  			return;
  	}
  
! 	if (wp->mode == NULL || wp->mode->mode != &window_view_mode) {
! 		window_pane_reset_mode(wp);
  		window_pane_set_mode(wp, &window_view_mode, NULL, NULL);
- 	}
  	window_copy_add(wp, "%s", msg);
  }
  
--- 76,84 ----
  			return;
  	}
  
! 	wme = TAILQ_FIRST(&wp->modes);
! 	if (wme == NULL || wme->mode != &window_view_mode)
  		window_pane_set_mode(wp, &window_view_mode, NULL, NULL);
  	window_copy_add(wp, "%s", msg);
  }