aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1998-08-05 22:32:02 +0000
committerRichard M. Stallman1998-08-05 22:32:02 +0000
commit72aca5fa28294a8ad967bfeda30843502d7e807b (patch)
tree8ae3abd38afbd57200e76e77d2bf062c8f4bc649
parentef96556f843d66d4930c006ca14dfb4558e0f3f8 (diff)
downloademacs-72aca5fa28294a8ad967bfeda30843502d7e807b.tar.gz
emacs-72aca5fa28294a8ad967bfeda30843502d7e807b.zip
(Vselection_coding_system): Renamed from Vclipboard_coding_system.
(syms_of_w32select): No need to staticpro Vselection_coding_system.
-rw-r--r--src/w32select.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/w32select.c b/src/w32select.c
index 7248559c38f..77d9af3fa6b 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -34,7 +34,7 @@ Lisp_Object QCLIPBOARD;
34 34
35/* Coding system for communicating with other Windows programs via the 35/* Coding system for communicating with other Windows programs via the
36 clipboard. */ 36 clipboard. */
37static Lisp_Object Vclipboard_coding_system; 37static Lisp_Object Vselection_coding_system;
38 38
39#if 0 39#if 0
40DEFUN ("w32-open-clipboard", Fw32_open_clipboard, Sw32_open_clipboard, 0, 1, 0, 40DEFUN ("w32-open-clipboard", Fw32_open_clipboard, Sw32_open_clipboard, 0, 1, 0,
@@ -182,7 +182,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, Sw32_set_clipboard_dat
182 HANDLE htext2; 182 HANDLE htext2;
183 183
184 setup_coding_system 184 setup_coding_system
185 (Fcheck_coding_system (Vclipboard_coding_system), &coding); 185 (Fcheck_coding_system (Vselection_coding_system), &coding);
186 coding.mode |= CODING_MODE_LAST_BLOCK; 186 coding.mode |= CODING_MODE_LAST_BLOCK;
187 bufsize = encoding_buffer_size (&coding, nbytes); 187 bufsize = encoding_buffer_size (&coding, nbytes);
188 if ((htext = GlobalAlloc (GMEM_MOVEABLE | GMEM_DDESHARE, bufsize)) == NULL) 188 if ((htext = GlobalAlloc (GMEM_MOVEABLE | GMEM_DDESHARE, bufsize)) == NULL)
@@ -255,7 +255,7 @@ DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data, Sw32_get_clipboard_dat
255 struct coding_system coding; 255 struct coding_system coding;
256 256
257 setup_coding_system 257 setup_coding_system
258 (Fcheck_coding_system(Vclipboard_coding_system), &coding); 258 (Fcheck_coding_system(Vselection_coding_system), &coding);
259 coding.mode |= CODING_MODE_LAST_BLOCK; 259 coding.mode |= CODING_MODE_LAST_BLOCK;
260 bufsize = decoding_buffer_size (&coding, nbytes); 260 bufsize = decoding_buffer_size (&coding, nbytes);
261 buf = (unsigned char *) xmalloc (bufsize); 261 buf = (unsigned char *) xmalloc (bufsize);
@@ -371,13 +371,12 @@ syms_of_w32select ()
371 defsubr (&Sw32_get_clipboard_data); 371 defsubr (&Sw32_get_clipboard_data);
372 defsubr (&Sx_selection_exists_p); 372 defsubr (&Sx_selection_exists_p);
373 373
374 DEFVAR_LISP ("clipboard-coding-system", &Vclipboard_coding_system, 374 DEFVAR_LISP ("selection-coding-system", &Vselection_coding_system,
375 "Coding system for communicating with other X clients.\n\ 375 "Coding system for communicating with other X clients.\n\
376When sending or receiving text via cut_buffer, selection, and clipboard,\n\ 376When sending or receiving text via cut_buffer, selection, and clipboard,\n\
377the text is encoded or decoded by this coding system.\n\ 377the text is encoded or decoded by this coding system.\n\
378A default value is `compound-text'"); 378A default value is `compound-text'");
379 Vclipboard_coding_system=intern ("iso-latin-1-dos"); 379 Vselection_coding_system=intern ("iso-latin-1-dos");
380 staticpro(&Vclipboard_coding_system);
381 380
382 QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD); 381 QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD);
383} 382}