Merge from emacs--devo--0

[gnu-emacs] / lisp / language / georgian.el

diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el
index 21b61b2667cb1d4141bf719c013c36eb3cb0a362..a1b565e76d415e767db61b9d35290674a5edb7b0 100644 (file)
--- a/lisp/language/georgian.el
+++ b/lisp/language/georgian.el
@@ -27,13 +27,23 @@
 
 ;;; Code:
 
+(define-coding-system 'georgian-ps
+  "Georgian PS encoding"
+  :coding-type 'charset
+  :mnemonic ?G
+  :charset-list '(georgian-ps))
+
+(define-coding-system 'georgian-academy
+  "Georgian Academy encoding"
+  :coding-type 'charset
+  :mnemonic ?G
+  :charset-list '(georgian-academy))
+
 (set-language-info-alist
  "Georgian" `((coding-system georgian-ps)
              (coding-priority georgian-ps)
              (input-method . "georgian")
-             (features code-pages)
-             (nonascii-translation . ,(get 'decode-georgian-ps
-                                           'translation-table))
+             (nonascii-translation . georgian-ps)
              (documentation . "Support for georgian-ps character set."))
  '("European"))                                ; fixme: is this appropriate for
                                        ; a non-Latin script?