fix merge

diff --cc src/client.c
index b5ef75d,b5ef75d..5df785d
--- 1/src/client.c
--- 2/src/client.c
+++ b/src/client.c
@@@ -180,6 -180,6 +180,7 @@@ void client_set_state(struct client *cl
          if (no_active == 0) {
              session_alert_watch(cl->session, SESSION_WATCH_SHOW);
              session_alert_watch(cl->session, SESSION_WATCH_BYTARGET);
++            session_alert_watch(cl->session, SESSION_WATCH_TERMLIST);
              session_alert_watch(cl->session, SESSION_WATCH_SHOW_PREF);
          }
      }
@@@ -551,6 -551,6 +552,7 @@@ void client_got_records(struct client *
          client_unlock(cl);
          session_alert_watch(se, SESSION_WATCH_SHOW);
          session_alert_watch(se, SESSION_WATCH_BYTARGET);
++        session_alert_watch(se, SESSION_WATCH_TERMLIST);
          session_alert_watch(se, SESSION_WATCH_RECORD);
          client_lock(cl);
      }