diff options
| author | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
| commit | adf2fc4a01efe77d73cd52bc9173914ed56ff531 (patch) | |
| tree | a5a280a5554a7bffeaf94fccae29fa3ac1a5d066 /src/w16select.c | |
| parent | 63191d9f2043d2e67657e85a7b3842805dd1dad6 (diff) | |
| parent | 38726039b77db432989fed106c88e9f1aa463281 (diff) | |
| download | emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.gz emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.zip | |
Merge from mainline.
Diffstat (limited to 'src/w16select.c')
| -rw-r--r-- | src/w16select.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/w16select.c b/src/w16select.c index 3bcc663e565..864757b3e61 100644 --- a/src/w16select.c +++ b/src/w16select.c | |||
| @@ -452,11 +452,7 @@ DEFUN ("w16-set-clipboard-data", Fw16_set_clipboard_data, Sw16_set_clipboard_dat | |||
| 452 | 452 | ||
| 453 | CHECK_STRING (string); | 453 | CHECK_STRING (string); |
| 454 | 454 | ||
| 455 | if (NILP (frame)) | 455 | if (!FRAME_MSDOS_P (decode_live_frame (frame))) |
| 456 | frame = Fselected_frame (); | ||
| 457 | |||
| 458 | CHECK_LIVE_FRAME (frame); | ||
| 459 | if ( !FRAME_MSDOS_P (XFRAME (frame))) | ||
| 460 | goto done; | 456 | goto done; |
| 461 | 457 | ||
| 462 | block_input (); | 458 | block_input (); |
| @@ -558,11 +554,7 @@ DEFUN ("w16-get-clipboard-data", Fw16_get_clipboard_data, Sw16_get_clipboard_dat | |||
| 558 | Lisp_Object ret = Qnil; | 554 | Lisp_Object ret = Qnil; |
| 559 | int require_decoding = 0; | 555 | int require_decoding = 0; |
| 560 | 556 | ||
| 561 | if (NILP (frame)) | 557 | if (!FRAME_MSDOS_P (decode_live_frame (frame))) |
| 562 | frame = Fselected_frame (); | ||
| 563 | |||
| 564 | CHECK_LIVE_FRAME (frame); | ||
| 565 | if ( !FRAME_MSDOS_P (XFRAME (frame))) | ||
| 566 | goto done; | 558 | goto done; |
| 567 | 559 | ||
| 568 | block_input (); | 560 | block_input (); |