From dbf64827d966c28fa93bf2c75a88d7f163a3d9b3 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Sat, 3 Oct 2009 13:31:08 +0000
Subject: [PATCH] * window.c (Fdelete_window): Check WINDOW argument. 
 (Bug#4618)

---
 src/ChangeLog | 4 ++++
 src/window.c  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 4226e20fd1b..7c5c49ccf3e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-03  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.c (Fdelete_window): Check WINDOW argument.  (Bug#4618)
+
 2009-10-02  Michael Albinus  <michael.albinus@gmx.de>
 
 	* lisp.h (Qdelete_directory_internal): Removed, because it is not
diff --git a/src/window.c b/src/window.c
index 08fd8c829fa..9b50a85b0ca 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1533,6 +1533,9 @@ Signal an error when WINDOW is the only window on its frame.  */)
   struct frame *f;
   if (NILP (window))
     window = selected_window;
+  else
+    CHECK_LIVE_WINDOW (window);
+
   f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
   delete_window (window);
 
-- 
2.39.5