===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/mode-tree.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/tmux/mode-tree.c	2020/05/16 16:16:07	1.47
--- src/usr.bin/tmux/mode-tree.c	2020/05/16 16:33:16	1.48
***************
*** 1,4 ****
! /* $OpenBSD: mode-tree.c,v 1.47 2020/05/16 16:16:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: mode-tree.c,v 1.48 2020/05/16 16:33:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 987,993 ****
  	choice = -1;
  	if (*key >= '0' && *key <= '9')
  		choice = (*key) - '0';
! 	else if (((*key) & KEYC_MASK_MOD) == KEYC_ESCAPE) {
  		tmp = (*key) & KEYC_MASK_KEY;
  		if (tmp >= 'a' && tmp <= 'z')
  			choice = 10 + (tmp - 'a');
--- 987,993 ----
  	choice = -1;
  	if (*key >= '0' && *key <= '9')
  		choice = (*key) - '0';
! 	else if (((*key) & KEYC_MASK_MOD) == KEYC_META) {
  		tmp = (*key) & KEYC_MASK_KEY;
  		if (tmp >= 'a' && tmp <= 'z')
  			choice = 10 + (tmp - 'a');
***************
*** 1111,1122 ****
  			mode_tree_build(mtd);
  		}
  		break;
! 	case '-'|KEYC_ESCAPE:
  		TAILQ_FOREACH(mti, &mtd->children, entry)
  			mti->expanded = 0;
  		mode_tree_build(mtd);
  		break;
! 	case '+'|KEYC_ESCAPE:
  		TAILQ_FOREACH(mti, &mtd->children, entry)
  			mti->expanded = 1;
  		mode_tree_build(mtd);
--- 1111,1122 ----
  			mode_tree_build(mtd);
  		}
  		break;
! 	case '-'|KEYC_META:
  		TAILQ_FOREACH(mti, &mtd->children, entry)
  			mti->expanded = 0;
  		mode_tree_build(mtd);
  		break;
! 	case '+'|KEYC_META:
  		TAILQ_FOREACH(mti, &mtd->children, entry)
  			mti->expanded = 1;
  		mode_tree_build(mtd);