From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 26 Feb 2002 16:38:05 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~16457
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3dfdc066a998907167fb2873abf95dbb745b811a;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aece4651523..20ff4e2d7d2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* international/mule.el (ctext-pre-write-conversion): Handle the
+	case when FROM is a string, and when we are called from
+	build_annotations_2.
+
 2002-02-26  Richard M. Stallman  <rms@gnu.org>
 
 	* rect.el (clear-rectangle-line): Reindent to the same column
diff --git a/src/ChangeLog b/src/ChangeLog
index 0a9ab3aeabf..fdeb0b359e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* xselect.c (Qcompound_text_with_extensions): Renamed from
+	Qcompound_text_no_extensions.
+	(lisp_data_to_selection_data, syms_of_xselect): Use the new name.
+
 2002-02-26  Juanma Barranquero  <lektu@terra.es>
 
 	* w32proc.c (syms_of_ntproc): Doc fix.