Merge from emacs-24

[bpt/emacs.git] / leim / ChangeLog

diff --git a/leim/ChangeLog b/leim/ChangeLog
index b6591af..47f22ec 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,15 @@
+2013-03-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * quail/latin-ltx.el: Resolve conflicts (bug#13950).
+       (latin-ltx--mark-map, latin-ltx--mark-re): New constants.
+       (latin-ltx--define-rules): Check for conflicts.  Eval `re's.
+       (rules): Use tighter regexps to avoid conflicts.
+       Consolidate the various rules for combining marks.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+       * Version 24.3 released.
+
 2013-02-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * quail/latin-ltx.el: Add greek superscripts.