aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2002-02-23 08:55:52 +0000
committerEli Zaretskii2002-02-23 08:55:52 +0000
commitb72d9870687a012c6b8d6123157aca2502017cef (patch)
tree3833b51f78ab5d49627afa0a22c5e6ebe666af4f /src
parentecb7ac215a43351f1464eaa4028d43eabee88da0 (diff)
downloademacs-b72d9870687a012c6b8d6123157aca2502017cef.tar.gz
emacs-b72d9870687a012c6b8d6123157aca2502017cef.zip
(Fw16_get_clipboard_data): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/w16select.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9233ab15333..7d07c91ca07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12002-02-23 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * w16select.c (Fw16_get_clipboard_data): Fix last change.
4
5 * xselect.c (selection_data_to_lisp_data): Fix last change.
6
12002-02-22 Jason Rumney <jasonr@gnu.org> 72002-02-22 Jason Rumney <jasonr@gnu.org>
2 8
3 * w32term.h (struct w32_output): New member menu_command_in_progress. 9 * w32term.h (struct w32_output): New member menu_command_in_progress.
diff --git a/src/w16select.c b/src/w16select.c
index 4f8a8951567..e1009fddfae 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -669,7 +669,7 @@ DEFUN ("w16-get-clipboard-data", Fw16_get_clipboard_data, Sw16_get_clipboard_dat
669 xfree (buf); 669 xfree (buf);
670 if (SYMBOLP (coding.post_read_conversion) 670 if (SYMBOLP (coding.post_read_conversion)
671 && !NILP (Ffboundp (coding.post_read_conversion))) 671 && !NILP (Ffboundp (coding.post_read_conversion)))
672 ret = run_pre_post_conversion_on_str (ret, coding, 0); 672 ret = run_pre_post_conversion_on_str (ret, &coding, 0);
673 Vlast_coding_system_used = coding.symbol; 673 Vlast_coding_system_used = coding.symbol;
674 } 674 }
675 else 675 else