Merge language/persian.el into language/misc-lang.el

* lisp/language/persian.el: Remove file.
* lisp/language/misc-lang.el: Move non-unique part of persian.el here.
* lisp/loadup.el: Remove language/persian.

* src/lisp.mk (lisp): Remove language/persian.elc.

* etc/NEWS: Improve entry.

7 files changed, 19 insertions, 65 deletions

diff --git a/etc/NEWS b/etc/NEWS
index affc4480c9..e9408ff45e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -112,7 +112,7 @@ treated as images.
 
 ** Internationalization changes
 
-*** Added language support for Persian.
+*** New language environment: Persian.
 
 ** Face underlining can now use a wave.
 See the "Face Attributes" section of the Elisp manual.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 479fee0202..716ed4c095 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-08  Glenn Morris  <[email protected]>
+
+	* language/persian.el: Remove file.
+	* language/misc-lang.el: Move non-unique part of persian.el here.
+	* loadup.el: Remove language/persian.
+
 2012-08-08  Óscar Fuentes  <[email protected]>
 
 	* vc/diff-mode.el (diff-remove-trailing-whitespace): New function.
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index 1286b36189..ee06e34eef 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -67,6 +67,14 @@ and Italian.")))
 	    (sample-text . "Arabic	السّلام عليكم")
 	    (documentation . "Bidirectional editing is supported.")))
 
+(set-language-info-alist
+ "Persian" '((charset unicode)
+	    (coding-system utf-8 iso-8859-6 windows-1256)
+	    (coding-priority utf-8 iso-8859-6 windows-1256)
+	    (input-method . "farsi-transliterate-banan")
+	    (sample-text . "Persian	فارسی")
+	    (documentation . "Bidirectional editing is supported.")))
+
 (set-char-table-range
  composition-function-table
  '(#x600 . #x6FF)
diff --git a/lisp/language/persian.el b/lisp/language/persian.el
deleted file mode 100644
index 8860acd1ca..0000000000
--- a/lisp/language/persian.el
+++ /dev/null
@@ -1,62 +0,0 @@
-;;; persian.el  --- support for Persian	-*- coding: utf-8;-*-
-
-;; Copyright (C) 2012 Free Software Foundation, Inc.
-
-;; Author: Mohsen BANAN <[email protected]>
-;; X-URL: http://mohsen.1.banan.byname.net/contact
-
-;; Keywords: multilingual, Farsi, Persian
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; For Persian, the character set ISO8859-6 is supported.  (Same as Arabic)
-
-;;; Code:
-
-(define-coding-system 'iso-8859-6
-  "ISO-8859-6 based encoding (MIME:ISO-8859-6)."
-  :coding-type 'charset
-  :mnemonic ?6
-  :charset-list '(iso-8859-6)
-  :mime-charset 'iso-8859-6)
-
-(define-coding-system 'windows-1256
-  "windows-1256 (Arabic) encoding (MIME: WINDOWS-1256)"
-  :coding-type 'charset
-  :mnemonic ?A
-  :charset-list '(windows-1256)
-  :mime-charset 'windows-1256)
-
-(define-coding-system-alias 'cp1256 'windows-1256)
-
-(set-language-info-alist
- "Persian" '((charset unicode)
-	    (coding-system utf-8 iso-8859-6 windows-1256)
-	    (coding-priority utf-8 iso-8859-6 windows-1256)
-	    (input-method . "farsi-transliterate-banan")
-	    (sample-text . "Persian	فارسی")
-	    (documentation . "Bidirectional editing is supported.")))
-
-(set-char-table-range
- composition-function-table
- '(#x600 . #x6FF)
- (list ["[\u0600-\u06FF]+" 0 font-shape-gstring]))
-
-(provide 'persian)
-
-;;; persian.el ends here
diff --git a/lisp/loadup.el b/lisp/loadup.el
index d316f28a37..a460fcab33 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -159,7 +159,6 @@
 (load "language/japanese")
 (load "language/korean")
 (load "language/lao")
-(load "language/persian")
 (load "language/tai-viet")
 (load "language/thai")
 (load "language/tibetan")
diff --git a/src/ChangeLog b/src/ChangeLog
index 7919b6f8f8..e68c6edc8d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-08  Glenn Morris  <[email protected]>
+
+	* lisp.mk (lisp): Remove language/persian.elc.
+
 2012-08-08  Dmitry Antipov  <[email protected]>
 
 	Cleanup intervals.
diff --git a/src/lisp.mk b/src/lisp.mk
index 70296e0636..162d881991 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -95,7 +95,6 @@ lisp = \
 	$(lispsource)/language/japanese.elc \
 	$(lispsource)/language/korean.elc \
 	$(lispsource)/language/lao.elc \
-	$(lispsource)/language/persian.elc \
 	$(lispsource)/language/tai-viet.elc \
 	$(lispsource)/language/thai.elc \
 	$(lispsource)/language/tibetan.elc \