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 | df5086fc6f94d9f2ec1cedf5f6909a78b20a3669 (patch) | |
| tree | 058a202ce9227d6562894365845e5bb806e3a8b4 /leim | |
| parent | 2d5c0a9671762fbe96bdd6f119cf15fe50ba58bc (diff) | |
| parent | d9b3235531ef6c4a86db9ea68ddb666645db86d4 (diff) | |
| download | emacs-df5086fc6f94d9f2ec1cedf5f6909a78b20a3669.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"]) |