diff options
| author | Stefan Monnier | 2010-08-31 21:42:39 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-08-31 21:42:39 +0200 |
| commit | b819f760b16314638fb374e73eeb0fba3c60b5c6 (patch) | |
| tree | c92e09d7798aeed2582598ccadc0393f04051a90 /src | |
| parent | 61f7096c3b5e1d5097f3655bea4091e9fcfd7128 (diff) | |
| download | emacs-b819f760b16314638fb374e73eeb0fba3c60b5c6.tar.gz emacs-b819f760b16314638fb374e73eeb0fba3c60b5c6.zip | |
* src/keyboard.c (Fwindow_system): Fix compilation for USE_LISP_UNION_TYPE.
Diffstat (limited to 'src')
| -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 27cda2b66e9..fc98bcc11e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-08-31 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * keyboard.c (Fwindow_system): Fix compilation for USE_LISP_UNION_TYPE. | ||
| 4 | |||
| 1 | 2010-08-31 Chong Yidong <cyd@stupidchicken.com> | 5 | 2010-08-31 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * keyboard.c (command_loop_1): Don't call x-set-selection on tty. | 7 | * 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) | |||
| 1493 | } | 1493 | } |
| 1494 | #endif | 1494 | #endif |
| 1495 | 1495 | ||
| 1496 | /* FIXME: This is wrong rather than test window-system, we should call | ||
| 1497 | a new set-selection, which will then dispatch to x-set-selection, or | ||
| 1498 | tty-set-selection, or w32-set-selection, ... */ | ||
| 1499 | EXFUN (Fwindow_system, 1); | ||
| 1500 | |||
| 1496 | Lisp_Object | 1501 | Lisp_Object |
| 1497 | command_loop_1 (void) | 1502 | command_loop_1 (void) |
| 1498 | { | 1503 | { |