diff options
Diffstat (limited to 'src/w32select.c')
| -rw-r--r-- | src/w32select.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/w32select.c b/src/w32select.c index 41554b87c33..3c554c622ae 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -95,8 +95,8 @@ static Lisp_Object render_locale (void); static Lisp_Object render_all (Lisp_Object ignore); static void run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg); static Lisp_Object lisp_error_handler (Lisp_Object error); -static LRESULT CALLBACK owner_callback (HWND win, UINT msg, - WPARAM wp, LPARAM lp); +static LRESULT CALLBACK ALIGN_STACK owner_callback (HWND win, UINT msg, + WPARAM wp, LPARAM lp); static HWND create_owner (void); static void setup_config (void); @@ -107,17 +107,11 @@ static Lisp_Object validate_coding_system (Lisp_Object coding_system); static void setup_windows_coding_system (Lisp_Object coding_system, struct coding_system * coding); - -/* A remnant from X11: Symbol for the CLIPBORD selection type. Other - selections are not used on Windows, so we don't need symbols for - PRIMARY and SECONDARY. */ -Lisp_Object QCLIPBOARD; - /* Internal pseudo-constants, initialized in globals_of_w32select() based on current system parameters. */ static LCID DEFAULT_LCID; static UINT ANSICP, OEMCP; -static Lisp_Object QUNICODE, QANSICP, QOEMCP; +static Lisp_Object QANSICP, QOEMCP; /* A hidden window just for the clipboard management. */ static HWND clipboard_owner; @@ -420,7 +414,7 @@ lisp_error_handler (Lisp_Object error) } -static LRESULT CALLBACK +static LRESULT CALLBACK ALIGN_STACK owner_callback (HWND win, UINT msg, WPARAM wp, LPARAM lp) { switch (msg) @@ -1013,9 +1007,9 @@ DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data, return (ret); } -/* Support checking for a clipboard selection. */ +/* Support checking for a clipboard selection. */ -DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p, +DEFUN ("w32-selection-exists-p", Fw32_selection_exists_p, Sw32_selection_exists_p, 0, 2, 0, doc: /* Whether there is an owner for the given X selection. SELECTION should be the name of the selection in question, typically @@ -1031,7 +1025,7 @@ frame's display, or the first available X display. */) CHECK_SYMBOL (selection); /* Return nil for PRIMARY and SECONDARY selections; for CLIPBOARD, check - if the clipboard currently has valid text format contents. */ + if the clipboard currently has valid text format contents. */ if (EQ (selection, QCLIPBOARD)) { @@ -1060,14 +1054,14 @@ frame's display, or the first available X display. */) } /* One-time init. Called in the un-dumped Emacs, but not in the - dumped version. */ + dumped version. */ void syms_of_w32select (void) { defsubr (&Sw32_set_clipboard_data); defsubr (&Sw32_get_clipboard_data); - defsubr (&Sx_selection_exists_p); + defsubr (&Sw32_selection_exists_p); DEFVAR_LISP ("selection-coding-system", Vselection_coding_system, doc: /* Coding system for communicating with other programs. |