Merge from emacs--rel--22

[bpt/emacs.git] / lisp / language / romanian.el

diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index 7fdfa57..9776fe2 100644 (file)
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -1,6 +1,7 @@
-;;; romanian.el --- Support for Romanian
+;;; romanian.el --- support for Romanian -*- coding: iso-latin-2; no-byte-compile: t -*-
 
-;; Copyright (C) 1998 Free Software Foundation.
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation.
 
 ;; Author:    Dan Nicolaescu <done@ece.arizona.edu>
 ;; Keywords: multilingual, Romanian
@@ -19,8 +20,8 @@
 
 ;; 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -28,22 +29,20 @@
 
 ;;; Code:
 
-(defun setup-romanian-environment ()
-  "Setup multilingual environment (MULE) for Romanian."
-  (interactive)
-  (setup-8-bit-environment "Romanian" 'latin-iso8859-2 "romanian")
-  (load "latin-2"))
-
 (set-language-info-alist
- "Romanian" '((setup-function . setup-romanian-environment)
-           (charset . (ascii latin-iso8859-2))
-           (coding-system . (iso-8859-2))
-           (coding-priority . (iso-8859-2))
-           (sample-text . "Bunã ziua, bine aþi venit!")
-           (documentation . nil))
+ "Romanian" '((charset . (ascii latin-iso8859-2))
+             (coding-system . (iso-8859-2))
+             (coding-priority . (iso-8859-2))
+             (nonascii-translation . latin-iso8859-2)
+             (input-method . "latin-2-postfix")
+             (unibyte-syntax . "latin-2")
+             (unibyte-display . iso-8859-2)
+             (tutorial . "TUTORIAL.ro")
+             (sample-text . "Bunã ziua, bine aþi venit!")
+             (documentation . t))
  '("European"))
 
 (provide 'romanian)
 
-;; romanian.el ends here
-
+;;; arch-tag: a0bf93ee-2f02-4678-a477-c08acc35366b
+;;; romanian.el ends here