Merge from mainline.

[bpt/emacs.git] / leim / quail / vntelex.el

diff --git a/leim/quail/vntelex.el b/leim/quail/vntelex.el
index 11f7748..40380ee 100644 (file)
--- a/leim/quail/vntelex.el
+++ b/leim/quail/vntelex.el
@@ -1,7 +1,6 @@
 ;;; vntelex.el --- Quail package for Vietnamese by Telex method
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 ;; Author:   Werner Lemberg <wl@gnu.org>
 ;; Keywords: multilingual, input method, Vietnamese
@@ -53,7 +52,7 @@ Other diacritics:
   acute         s      as -> \e,1a\e(B
   grave         f      af -> \e,1`\e(B
   hook above    r      ar -> \e,1d\e(B
-  tilde         x      ax  -> \e,1c\e(B
+  tilde         x      ax -> \e,1c\e(B
   dot below     j      aj -> \e,1U\e(B
 
   d bar                dd -> \e,1p\e(B
@@ -285,7 +284,7 @@ and postfix: Eee -> Ee, ajj -> aj, etc.
  ("Dd" ?\e,2p\e(B)
 ;("$$" ?\e$,1tK\e(B)     ; U+20AB DONG SIGN (#### check)
 
- ("aff" ["aff"])
+ ("aff" ["af"])
  ("AFF" ["AF"])
  ("Aff" ["Af"])
  ("ass" ["as"])
@@ -426,5 +425,4 @@ and postfix: Eee -> Ee, ajj -> aj, etc.
 ;; coding: iso-2022-7bit
 ;; End:
 
-;; arch-tag: 60db6880-0c9f-4456-b9fe-628de053a5ab
 ;;; vntelex.el ends here