diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-19 11:07:52 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-19 11:07:52 -0400 |
| commit | 6e104790e756226cbb5b7feaf01854103ded9f36 (patch) | |
| tree | 5a1bd758627d6358a7083bb3d72108676bde8bdb /leim | |
| parent | b5feea0feaf721c66ff34ee2728c76a4c028fa0f (diff) | |
| parent | 79d74ac527b79242175bca1b39ef12b1693c3523 (diff) | |
| download | emacs-6e104790e756226cbb5b7feaf01854103ded9f36.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/ChangeLog | 4 | ||||
| -rw-r--r-- | leim/quail/vntelex.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index 9dd41d3bafa..22642193588 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2010-04-06 Chong Yidong <cyd@stupidchicken.com> + + * quail/vntelex.el: Fix "af" rule (Bug#5836). + 2010-03-27 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in ($(TIT), $(MISC_DIC), leim-list.el): Enclose the diff --git a/leim/quail/vntelex.el b/leim/quail/vntelex.el index bfa1cc9263f..8af020b093c 100644 --- a/leim/quail/vntelex.el +++ b/leim/quail/vntelex.el @@ -285,7 +285,7 @@ and postfix: Eee -> Ee, ajj -> aj, etc. ("Dd" ?,2p(B) ;("$$" ?$,1tK(B) ; U+20AB DONG SIGN (#### check) - ("aff" ["aff"]) + ("aff" ["af"]) ("AFF" ["AF"]) ("Aff" ["Af"]) ("ass" ["as"]) |