From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 31 Aug 2010 19:42:39 +0000 (+0200)
Subject: * src/keyboard.c (Fwindow_system): Fix compilation for USE_LISP_UNION_TYPE.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~177
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b819f760b16314638fb374e73eeb0fba3c60b5c6;p=emacs.git

* src/keyboard.c (Fwindow_system): Fix compilation for USE_LISP_UNION_TYPE.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 27cda2b66e9..fc98bcc11e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* keyboard.c (Fwindow_system): Fix compilation for USE_LISP_UNION_TYPE.
+
 2010-08-31  Chong Yidong  <cyd@stupidchicken.com>
 
 	* keyboard.c (command_loop_1): Don't call x-set-selection on tty.
diff --git a/src/keyboard.c b/src/keyboard.c
index 46e0afc15a4..7b1a39403f3 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1493,6 +1493,11 @@ cancel_hourglass_unwind (Lisp_Object arg)
 }
 #endif
 
+/* FIXME: This is wrong rather than test window-system, we should call
+   a new set-selection, which will then dispatch to x-set-selection, or
+   tty-set-selection, or w32-set-selection, ...  */
+EXFUN (Fwindow_system, 1);
+
 Lisp_Object
 command_loop_1 (void)
 {