diff options
| author | Stefan Monnier <[email protected]> | 2010-08-31 21:42:39 +0200 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2010-08-31 21:42:39 +0200 |
| commit | b819f760b16314638fb374e73eeb0fba3c60b5c6 (patch) | |
| tree | c92e09d7798aeed2582598ccadc0393f04051a90 | |
| parent | 61f7096c3b5e1d5097f3655bea4091e9fcfd7128 (diff) | |
* src/keyboard.c (Fwindow_system): Fix compilation for USE_LISP_UNION_TYPE.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 27cda2b66e..fc98bcc11e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-08-31 Stefan Monnier <[email protected]> + + * keyboard.c (Fwindow_system): Fix compilation for USE_LISP_UNION_TYPE. + 2010-08-31 Chong Yidong <[email protected]> * keyboard.c (command_loop_1): Don't call x-set-selection on tty. diff --git a/src/keyboard.c b/src/keyboard.c index 46e0afc15a..7b1a39403f 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) { |