===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.1028
retrieving revision 1.1029
diff -c -r1.1028 -r1.1029
*** src/usr.bin/tmux/tmux.h	2020/05/16 15:16:37	1.1028
--- src/usr.bin/tmux/tmux.h	2020/05/16 15:24:28	1.1029
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.1028 2020/05/16 15:16:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.1029 2020/05/16 15:24:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1806,1811 ****
--- 1806,1812 ----
  void		 paste_add(const char *, char *, size_t);
  int		 paste_rename(const char *, const char *, char **);
  int		 paste_set(char *, size_t, const char *, char **);
+ void		 paste_replace(struct paste_buffer *, char *, size_t);
  char		*paste_make_sample(struct paste_buffer *);
  
  /* format.c */
***************
*** 2813,2824 ****
  #define POPUP_WRITEKEYS 0x1
  #define POPUP_CLOSEEXIT 0x2
  #define POPUP_CLOSEEXITZERO 0x4
  u_int		 popup_width(struct cmdq_item *, u_int, const char **,
  		    struct client *, struct cmd_find_state *);
  u_int		 popup_height(u_int, const char **);
  int		 popup_display(int, struct cmdq_item *, u_int, u_int, u_int,
  		    u_int, u_int, const char **, const char *, const char *,
! 		    const char *, struct client *, struct cmd_find_state *);
  
  /* style.c */
  int		 style_parse(struct style *,const struct grid_cell *,
--- 2814,2827 ----
  #define POPUP_WRITEKEYS 0x1
  #define POPUP_CLOSEEXIT 0x2
  #define POPUP_CLOSEEXITZERO 0x4
+ typedef void (*popup_close_cb)(int, void *);
  u_int		 popup_width(struct cmdq_item *, u_int, const char **,
  		    struct client *, struct cmd_find_state *);
  u_int		 popup_height(u_int, const char **);
  int		 popup_display(int, struct cmdq_item *, u_int, u_int, u_int,
  		    u_int, u_int, const char **, const char *, const char *,
! 		    const char *, struct client *, struct cmd_find_state *,
! 		    popup_close_cb, void *);
  
  /* style.c */
  int		 style_parse(struct style *,const struct grid_cell *,