Sync OpenBSD patchset 723:

Rename activity->alert in a couple of functions for consistency.

1 files changed, 13 insertions, 13 deletions

diff --git a/session.c b/session.c
index fc9d8500..fccbd3e3 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $Id: session.c,v 1.74 2009-12-26 23:45:21 tcunha Exp $ */
+/* $Id: session.c,v 1.75 2010-06-22 23:22:31 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,8 +31,8 @@ struct sessions	sessions;
 struct sessions dead_sessions;
 struct session_groups session_groups;
 
-struct winlink *session_next_activity(struct session *, struct winlink *);
-struct winlink *session_previous_activity(struct session *, struct winlink *);
+struct winlink *session_next_alert(struct session *, struct winlink *);
+struct winlink *session_previous_alert(struct session *, struct winlink *);
 
 void
 session_alert_cancel(struct session *s, struct winlink *wl)
@@ -309,7 +309,7 @@ session_has(struct session *s, struct window *w)
 }
 
 struct winlink *
-session_next_activity(struct session *s, struct winlink *wl)
+session_next_alert(struct session *s, struct winlink *wl)
 {
 	while (wl != NULL) {
 		if (session_alert_has(s, wl, WINDOW_BELL))
@@ -325,7 +325,7 @@ session_next_activity(struct session *s, struct winlink *wl)
 
 /* Move session to next window. */
 int
-session_next(struct session *s, int activity)
+session_next(struct session *s, int alert)
 {
 	struct winlink	*wl;
 
@@ -333,11 +333,11 @@ session_next(struct session *s, int activity)
 		return (-1);
 
 	wl = winlink_next(s->curw);
-	if (activity)
-		wl = session_next_activity(s, wl);
+	if (alert)
+		wl = session_next_alert(s, wl);
 	if (wl == NULL) {
 		wl = RB_MIN(winlinks, &s->windows);
-		if (activity && ((wl = session_next_activity(s, wl)) == NULL))
+		if (alert && ((wl = session_next_alert(s, wl)) == NULL))
 			return (-1);
 	}
 	if (wl == s->curw)
@@ -350,7 +350,7 @@ session_next(struct session *s, int activity)
 }
 
 struct winlink *
-session_previous_activity(struct session *s, struct winlink *wl)
+session_previous_alert(struct session *s, struct winlink *wl)
 {
 	while (wl != NULL) {
 		if (session_alert_has(s, wl, WINDOW_BELL))
@@ -366,7 +366,7 @@ session_previous_activity(struct session *s, struct winlink *wl)
 
 /* Move session to previous window. */
 int
-session_previous(struct session *s, int activity)
+session_previous(struct session *s, int alert)
 {
 	struct winlink	*wl;
 
@@ -374,11 +374,11 @@ session_previous(struct session *s, int activity)
 		return (-1);
 
 	wl = winlink_previous(s->curw);
-	if (activity)
-		wl = session_previous_activity(s, wl);
+	if (alert)
+		wl = session_previous_alert(s, wl);
 	if (wl == NULL) {
 		wl = RB_MAX(winlinks, &s->windows);
-		if (activity && (wl = session_previous_activity(s, wl)) == NULL)
+		if (alert && (wl = session_previous_alert(s, wl)) == NULL)
 			return (-1);
 	}
 	if (wl == s->curw)