[Emacs-diffs] /srv/bzr/emacs/trunk r109505: Merge language/persian.el into language/misc-lang.el

[Glenn Morris]

------------------------------------------------------------
revno: 109505
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-08 00:19:58 -0700
message:
  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.
removed:
  lisp/language/persian.el
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/language/misc-lang.el
  lisp/loadup.el
  src/ChangeLog
  src/lisp.mk

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-08-07 03:31:53 +0000
+++ b/etc/NEWS  2012-08-08 07:19:58 +0000
@@ -112,7 +112,7 @@
 
 ** 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.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-08 04:41:35 +0000
+++ b/lisp/ChangeLog    2012-08-08 07:19:58 +0000
@@ -1,3 +1,9 @@
+2012-08-08  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * vc/diff-mode.el (diff-remove-trailing-whitespace): New function.

=== modified file 'lisp/language/misc-lang.el'
--- a/lisp/language/misc-lang.el        2012-05-08 01:50:17 +0000
+++ b/lisp/language/misc-lang.el        2012-08-08 07:19:58 +0000
@@ -67,6 +67,14 @@
            (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)

=== removed file 'lisp/language/persian.el'
--- a/lisp/language/persian.el  2012-08-06 07:31:31 +0000
+++ b/lisp/language/persian.el  1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-;;; persian.el  --- support for Persian        -*- coding: utf-8;-*-
-
-;; Copyright (C) 2012 Free Software Foundation, Inc.
-
-;; Author: Mohsen BANAN <address@hidden>
-;; 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

=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el    2012-08-06 07:31:31 +0000
+++ b/lisp/loadup.el    2012-08-08 07:19:58 +0000
@@ -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")

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-08 06:11:29 +0000
+++ b/src/ChangeLog     2012-08-08 07:19:58 +0000
@@ -1,3 +1,7 @@
+2012-08-08  Glenn Morris  <address@hidden>
+
+       * lisp.mk (lisp): Remove language/persian.elc.
+
 2012-08-08  Dmitry Antipov  <address@hidden>
 
        Cleanup intervals.

=== modified file 'src/lisp.mk'
--- a/src/lisp.mk       2012-08-06 07:37:26 +0000
+++ b/src/lisp.mk       2012-08-08 07:19:58 +0000
@@ -95,7 +95,6 @@
        $(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 \