--- a/lisp/leim/quail/viqr.el	Mon Aug 13 09:59:07 2007 +0200
+++ b/lisp/leim/quail/viqr.el	Mon Aug 13 10:00:02 2007 +0200
@@ -1,7 +1,7 @@
 ;; quail/viqr.el -- Quail packages for inputting Vietnamese with VIQR system
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
+;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
+;; Licensed to the Free Software Foundation.
 
 ;; Keywords: multilingual, input method, latin
 
@@ -18,13 +18,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
 
 (require 'quail)
-(require 'language/viet-util)
+(require 'viet-util)
 
 ;; `viet-viqr-alist' is an alist of Vietnamese characters vs
 ;; corresponding VIQR strings.  We create Quail map which maps VIQR
@@ -39,8 +40,9 @@
 	    (setq l (cdr l)))
 	  rules)))
 
-(quail-define-package "quail-viqr" "Vietnamese" "VIQR" t
-		      "Vietnamese inputting method with VIQR mnemonic system:
+(quail-define-package
+ "vietnamese-viqr" "Vietnamese" "VQ" t
+ "Vietnamese input method with VIQR mnemonic system
 
     effect   | postfix | examples
  ------------+---------+----------
@@ -56,10 +58,10 @@
  ------------+---------+----------
     d bar    |   dd    | dd -> ,1p(B
  ------------+---------+----------
-  no compose |    \    | a\. -> a.
+  no compose |    \\    | a\\. -> a.
  ------------+---------+----------
   combination|   (~    | a(~ -> ,1G(B
-" nil t t nil nil t)
+" nil t t nil nil t nil nil nil nil t)
 
 
 (viet-quail-define-rules)