diff options
| author | Jason Rumney <[email protected]> | 2005-02-15 23:19:26 +0000 |
|---|---|---|
| committer | Jason Rumney <[email protected]> | 2005-02-15 23:19:26 +0000 |
| commit | 52c7f9eea2faf4094df00bf30d2d7cd2210c8cb5 (patch) | |
| tree | 75db6243e27131ee03d6c73d2323841e627b19e7 /src/s | |
| parent | d02d0705b396b0deed399af01a370e8c9de6f7e6 (diff) | |
2004-11-08 Benjamin Riefenstahl <[email protected]>
* w32select.c: Summary: Thorough rework to implement Unicode
clipboard operations and delayed rendering.
Drop last_clipboard_text and related code, keep track of
ownership via clipboard_owner instead. Drop old #if0
sections.
(DEFAULT_LCID, ANSICP, OEMCP, QUNICODE, QANSICP, QOEMCP)
(clipboard_owner, modifying_clipboard, cfg_coding_system)
(cfg_codepage, cfg_lcid, cfg_clipboard_type, current_text)
(current_coding_system, current_requires_encoding)
(current_num_nls, current_clipboard_type, current_lcid): New
static variables.
(convert_to_handle_as_ascii, convert_to_handle_as_coded)
(render, render_all, run_protected, lisp_error_handler)
(owner_callback, create_owner, setup_config)
(enum_locale_callback, cp_from_locale, coding_from_cp): New
local functions.
(term_w32select, globals_of_w32select): New global functions.
(Fw32_set_clipboard_data): Ignore parameter FRAME, use
clipboard_owner instead. Use delayed rendering and provide
all text formats. Provide CF_LOCALE if necessary.
(Fw32_get_clipboard_data): Handle CF_UNICODETEXT and
CF_LOCALE. Fall back to CF_TEXT, if CF_UNICODETEXT is not
available. Force DOS line-ends for decoding.
(Fx_selection_exists_p): Handle CF_UNICODETEXT.
(syms_of_w32select): Init and register new variables.
* w32.h: Add prototypes for globals_of_w32select and
term_w32select. Make the neighboring K&R declarations into
prototypes, too.
* emacs.c: Include w32.h to get function prototypes.
(main): Call globals_of_w32select.
* w32.c (term_ntproc): Call term_w32select.
* mule-cmds.el (set-locale-environment): Remove call to
set-selection-coding-system on Windows.
* s/ms-w32.h: Guard MSC-specific #pragmas with an #ifdef.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/ms-w32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 09d31ed2e0..503c8547c6 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -477,8 +477,10 @@ extern char *get_emacs_configuration_options (void); must include config.h to pick up this pragma. */ /* Names must be < 8 bytes */ +#ifdef _MSC_VER #pragma data_seg("EMDATA") #pragma bss_seg("EMBSS") +#endif /* #define FULL_DEBUG */ /* #define EMACSDEBUG */ |