From e34c6e2305ef3e04d570755360c25651c2fb199f Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Wed, 11 Aug 2010 22:16:43 +0000
Subject: [PATCH] Sync OpenBSD patchset 746:

Treat trying to link or move to the same window as an error to avoid
removing it accidentally.
---
 server-fn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server-fn.c b/server-fn.c
index 6c100398..5865c332 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -1,4 +1,4 @@
-/* $Id: server-fn.c,v 1.109 2010-08-09 21:44:25 tcunha Exp $ */
+/* $Id: server-fn.c,v 1.110 2010-08-11 22:16:43 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -281,7 +281,7 @@ server_link_window(struct session *src, struct winlink *srcwl,
 		dstwl = winlink_find_by_index(&dst->windows, dstidx);
 	if (dstwl != NULL) {
 		if (dstwl->window == srcwl->window)
-			return (0);
+			return (-1);
 		if (killflag) {
 			/*
 			 * Can't use session_detach as it will destroy session