===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-parse.y,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/tmux/cmd-parse.y	2020/01/27 08:23:42	1.22
--- src/usr.bin/tmux/cmd-parse.y	2020/01/28 13:10:14	1.23
***************
*** 1,4 ****
! /* $OpenBSD: cmd-parse.y,v 1.22 2020/01/27 08:23:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-parse.y,v 1.23 2020/01/28 13:10:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 341,347 ****
  			struct cmd_parse_state	*ps = &parse_state;
  
  			$$ = cmd_parse_new_commands();
! 			if (ps->scope == NULL || ps->scope->flag)
  				TAILQ_INSERT_TAIL($$, $1, entry);
  			else
  				cmd_parse_free_command($1);
--- 341,348 ----
  			struct cmd_parse_state	*ps = &parse_state;
  
  			$$ = cmd_parse_new_commands();
! 			if ($1->name != NULL &&
! 			    (ps->scope == NULL || ps->scope->flag))
  				TAILQ_INSERT_TAIL($$, $1, entry);
  			else
  				cmd_parse_free_command($1);
***************
*** 360,366 ****
  		{
  			struct cmd_parse_state	*ps = &parse_state;
  
! 			if (ps->scope == NULL || ps->scope->flag) {
  				$$ = $1;
  				TAILQ_INSERT_TAIL($$, $3, entry);
  			} else {
--- 361,368 ----
  		{
  			struct cmd_parse_state	*ps = &parse_state;
  
! 			if ($3->name != NULL &&
! 			    (ps->scope == NULL || ps->scope->flag)) {
  				$$ = $1;
  				TAILQ_INSERT_TAIL($$, $3, entry);
  			} else {
***************
*** 641,648 ****
  	 * command list.
  	 */
  	TAILQ_FOREACH_SAFE(cmd, cmds, entry, next) {
- 		if (cmd->name == NULL)
- 			continue;
  		alias = cmd_get_alias(cmd->name);
  		if (alias == NULL)
  			continue;
--- 643,648 ----
***************
*** 688,695 ****
  	 */
  	result = cmd_list_new();
  	TAILQ_FOREACH(cmd, cmds, entry) {
- 		if (cmd->name == NULL)
- 			continue;
  		log_debug("%s: %u %s", __func__, cmd->line, cmd->name);
  		cmd_log_argv(cmd->argc, cmd->argv, __func__);
  
--- 688,693 ----