Merge from emacs--devo--0

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

diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index 715b061..51910b1 100644 (file)
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -1,19 +1,23 @@
 ;;; hebrew.el --- support for Hebrew -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007
+;;   2005, 2006, 2007, 2008
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
+;; Copyright (C) 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H13PRO009
+
 ;; Keywords: multilingual, Hebrew
 
 ;; 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 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -34,13 +38,12 @@
 
 ;;; Code:
 
-(make-coding-system
- 'hebrew-iso-8bit 2 ?8
- "ISO 2022 based 8-bit encoding for Hebrew (MIME:ISO-8859-8)."
- '(ascii hebrew-iso8859-8 nil nil
-   nil nil nil nil nil nil nil nil t nil nil t)
- '((safe-charsets ascii hebrew-iso8859-8)
-   (mime-charset . iso-8859-8)))
+(define-coding-system 'hebrew-iso-8bit
+  "ISO 2022 based 8-bit encoding for Hebrew (MIME:ISO-8859-8)."
+  :coding-type 'charset
+  :mnemonic ?8
+  :charset-list '(iso-8859-8)
+  :mime-charset 'iso-8859-8)
 
 (define-coding-system-alias 'iso-8859-8 'hebrew-iso-8bit)
 
@@ -52,10 +55,10 @@
 (define-coding-system-alias 'iso-8859-8-i 'hebrew-iso-8bit)
 
 (set-language-info-alist
- "Hebrew" '((charset . (hebrew-iso8859-8))
+ "Hebrew" '((charset iso-8859-8)
            (coding-priority hebrew-iso-8bit)
-           (coding-system . (hebrew-iso-8bit))
-           (nonascii-translation . hebrew-iso8859-8)
+           (coding-system hebrew-iso-8bit windows-1255 cp862)
+           (nonascii-translation . iso-8859-8)
            (input-method . "hebrew")
            (unibyte-display . hebrew-iso-8bit)
            (sample-text . "Hebrew      \e,Hylem\e(B")
@@ -64,11 +67,26 @@
 (set-language-info-alist
  "Windows-1255" '((coding-priority windows-1255)
                  (coding-system windows-1255)
-                 (features code-pages)
                  (documentation . "\
 Support for Windows-1255 encoding, e.g. for Yiddish.
 Right-to-left writing is not yet supported.")))
 
+(define-coding-system 'windows-1255
+  "windows-1255 (Hebrew) encoding (MIME: WINDOWS-1255)"
+  :coding-type 'charset
+  :mnemonic ?h
+  :charset-list '(windows-1255)
+  :mime-charset 'windows-1255)
+(define-coding-system-alias 'cp1255 'windows-1255)
+
+(define-coding-system 'cp862
+  "DOS codepage 862 (Hebrew)"
+  :coding-type 'charset
+  :mnemonic ?D
+  :charset-list '(cp862)
+  :mime-charset 'cp862)
+(define-coding-system-alias 'ibm862 'cp862)
+
 (provide 'hebrew)
 
 ;;; arch-tag: 3ca04f32-3f1e-498e-af46-8267498ba5d9