Synch with FSF Emacs CVS.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index e7a39e9bada75500170cf02d5013bc8814cdf675..58acf99ee7fef2503f714c124c83fda6101ada11 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,17 @@
+2002-09-27  Karl Eichwalder  <ke@suse.de>
+
+       * po-compat.el (po-content-type-charset-alist): Convert the
+       car of each association to a string.  From emacs CVS
+       (lisp/textmodes/po.el); provided by Eli Zaretskii.
+       (po-find-file-coding-system-guts): If the charset matches a name
+       of a codepage, set up that codepage and return it as a coding
+       system to decode the file.  Likewise from emacs CVS.
+
+       * po-compat.el: Line up comment etc. with lisp/textmodes/po.el.
+       (po-find-charset): Search for the Charset= header even if we've read
+       less than 4KB.  From emacs CVS (lisp/textmodes/po.el); provided by
+       Eli Zaretskii.
+
 2002-08-27  Bruno Haible  <bruno@clisp.org>
 
        * autopoint.in: Call func_fatal_error, not fatal_error.

diff --git a/misc/po-compat.el b/misc/po-compat.el
index c05832a9f3ddfdda44135a1b7d379de68a7c14aa..a06cbe4c5b1d89c476042da29ed861f7be5a1e1e 100644 (file)
--- a/misc/po-compat.el
+++ b/misc/po-compat.el
@@ -1,11 +1,11 @@
-;;; po-compat.el -- support for displaying GNU gettext PO files
+;;; po-compat.el --- basic support of PO translation files -*- coding: latin-1; -*-
 
 ;; Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
 
-;; Authors: François Pinard <pinard@iro.umontreal.ca>
-;;          Greg McGary <gkm@magilla.cichlid.com>
-;; Keywords: i18n gettext
-;; Created: 2002
+;; Authors: François Pinard <pinard@iro.umontreal.ca>,
+;;          Greg McGary <gkm@magilla.cichlid.com>,
+;;          Bruno Haible <bruno@clisp.org>.
+;; Keywords: i18n, files
 
 ;; This file is part of GNU gettext.
 
@@ -21,14 +21,18 @@
 
 ;; 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, 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
 ;; Emacs 21.2 and newer already contain this file, under the name po.el,
 ;; and without portability hassles.
 
+;; This package makes sure visiting PO files decodes them correctly,
+;; according to the Charset= header in the PO file.  For more support
+;; for editing PO files, see po-mode.el.
+
 ;;; Code:
 \f
 ;;; Emacs portability matters.
@@ -71,81 +75,81 @@
 
 (defconst po-content-type-charset-alist
   '(; Note: Emacs 21 doesn't support all encodings, thus the missing entries.
-    (ASCII . undecided)
-    (ANSI_X3.4-1968 . undecided)
-    (US-ASCII . undecided)
-    (ISO-8859-1 . iso-8859-1)
-    (ISO_8859-1 . iso-8859-1)
-    (ISO-8859-2 . iso-8859-2)
-    (ISO_8859-2 . iso-8859-2)
-    (ISO-8859-3 . iso-8859-3)
-    (ISO_8859-3 . iso-8859-3)
-    (ISO-8859-4 . iso-8859-4)
-    (ISO_8859-4 . iso-8859-4)
-    (ISO-8859-5 . iso-8859-5)
-    (ISO_8859-5 . iso-8859-5)
-    ;(ISO-8859-6 . ??)
-    ;(ISO_8859-6 . ??)
-    (ISO-8859-7 . iso-8859-7)
-    (ISO_8859-7 . iso-8859-7)
-    (ISO-8859-8 . iso-8859-8)
-    (ISO_8859-8 . iso-8859-8)
-    (ISO-8859-9 . iso-8859-9)
-    (ISO_8859-9 . iso-8859-9)
-    ;(ISO-8859-13 . ??)
-    ;(ISO_8859-13 . ??)
-    ;(ISO-8859-14 . ??)
-    ;(ISO_8859-14 . ??)
-    (ISO-8859-15 . iso-8859-15) ; requires Emacs 21
-    (ISO_8859-15 . iso-8859-15) ; requires Emacs 21
-    (KOI8-R . koi8-r)
-    ;(KOI8-U . ??)
-    ;(KOI8-T . ??)
-    (CP437 . cp437) ; requires Emacs 20
-    (CP775 . cp775) ; requires Emacs 20
-    (CP850 . cp850) ; requires Emacs 20
-    (CP852 . cp852) ; requires Emacs 20
-    (CP855 . cp855) ; requires Emacs 20
-    ;(CP856 . ??)
-    (CP857 . cp857) ; requires Emacs 20
-    (CP861 . cp861) ; requires Emacs 20
-    (CP862 . cp862) ; requires Emacs 20
-    (CP864 . cp864) ; requires Emacs 20
-    (CP865 . cp865) ; requires Emacs 20
-    (CP866 . cp866) ; requires Emacs 21
-    (CP869 . cp869) ; requires Emacs 20
-    ;(CP874 . ??)
-    ;(CP922 . ??)
-    ;(CP932 . ??)
-    ;(CP943 . ??)
-    ;(CP949 . ??)
-    ;(CP950 . ??)
-    ;(CP1046 . ??)
-    ;(CP1124 . ??)
-    ;(CP1129 . ??)
-    (CP1250 . cp1250) ; requires Emacs 20
-    (CP1251 . cp1251) ; requires Emacs 20
-    (CP1252 . iso-8859-1) ; approximation
-    (CP1253 . cp1253) ; requires Emacs 20
-    (CP1254 . iso-8859-9) ; approximation
-    (CP1255 . iso-8859-8) ; approximation
-    ;(CP1256 . ??)
-    (CP1257 . cp1257) ; requires Emacs 20
-    (GB2312 . cn-gb-2312)  ; also named 'gb2312' in XEmacs 21 or Emacs 21
-                           ; also named 'euc-cn' in Emacs 20 or Emacs 21
-    (EUC-JP . euc-jp)
-    (EUC-KR . euc-kr)
-    ;(EUC-TW . ??)
-    (BIG5 . big5)
-    ;(BIG5-HKSCS . ??)
-    ;(GBK . ??)
-    ;(GB18030 . ??)
-    (SHIFT_JIS . shift_jis)
-    ;(JOHAB . ??)
-    (TIS-620 . tis-620)    ; requires Emacs 20 or Emacs 21
-    (VISCII . viscii)      ; requires Emacs 20 or Emacs 21
-    ;(GEORGIAN-PS . ??)
-    (UTF-8 . utf-8)        ; requires Mule-UCS in Emacs 20, or Emacs 21
+    ("ASCII" . undecided)
+    ("ANSI_X3.4-1968" . undecided)
+    ("US-ASCII" . undecided)
+    ("ISO-8859-1" . iso-8859-1)
+    ("ISO_8859-1" . iso-8859-1)
+    ("ISO-8859-2" . iso-8859-2)
+    ("ISO_8859-2" . iso-8859-2)
+    ("ISO-8859-3" . iso-8859-3)
+    ("ISO_8859-3" . iso-8859-3)
+    ("ISO-8859-4" . iso-8859-4)
+    ("ISO_8859-4" . iso-8859-4)
+    ("ISO-8859-5" . iso-8859-5)
+    ("ISO_8859-5" . iso-8859-5)
+    ;("ISO-8859-6" . ??)
+    ;("ISO_8859-6" . ??)
+    ("ISO-8859-7" . iso-8859-7)
+    ("ISO_8859-7" . iso-8859-7)
+    ("ISO-8859-8" . iso-8859-8)
+    ("ISO_8859-8" . iso-8859-8)
+    ("ISO-8859-9" . iso-8859-9)
+    ("ISO_8859-9" . iso-8859-9)
+    ;("ISO-8859-13" . ??)
+    ;("ISO_8859-13" . ??)
+    ;("ISO-8859-14" . ??)
+    ;("ISO_8859-14" . ??)
+    ("ISO-8859-15" . iso-8859-15) ; requires Emacs 21
+    ("ISO_8859-15" . iso-8859-15) ; requires Emacs 21
+    ("KOI8-R" . koi8-r)
+    ;("KOI8-U" . ??)
+    ;("KOI8-T" . ??)
+    ("CP437" . cp437) ; requires Emacs 20
+    ("CP775" . cp775) ; requires Emacs 20
+    ("CP850" . cp850) ; requires Emacs 20
+    ("CP852" . cp852) ; requires Emacs 20
+    ("CP855" . cp855) ; requires Emacs 20
+    ;("CP856" . ??)
+    ("CP857" . cp857) ; requires Emacs 20
+    ("CP861" . cp861) ; requires Emacs 20
+    ("CP862" . cp862) ; requires Emacs 20
+    ("CP864" . cp864) ; requires Emacs 20
+    ("CP865" . cp865) ; requires Emacs 20
+    ("CP866" . cp866) ; requires Emacs 21
+    ("CP869" . cp869) ; requires Emacs 20
+    ;("CP874" . ??)
+    ;("CP922" . ??)
+    ;("CP932" . ??)
+    ;("CP943" . ??)
+    ;("CP949" . ??)
+    ;("CP950" . ??)
+    ;("CP1046" . ??)
+    ;("CP1124" . ??)
+    ;("CP1129" . ??)
+    ("CP1250" . cp1250) ; requires Emacs 20
+    ("CP1251" . cp1251) ; requires Emacs 20
+    ("CP1252" . iso-8859-1) ; approximation
+    ("CP1253" . cp1253) ; requires Emacs 20
+    ("CP1254" . iso-8859-9) ; approximation
+    ("CP1255" . iso-8859-8) ; approximation
+    ;("CP1256" . ??)
+    ("CP1257" . cp1257) ; requires Emacs 20
+    ("GB2312" . cn-gb-2312)  ; also named 'gb2312' in XEmacs 21 or Emacs 21
+                             ; also named 'euc-cn' in Emacs 20 or Emacs 21
+    ("EUC-JP" . euc-jp)
+    ("EUC-KR" . euc-kr)
+    ;("EUC-TW" . ??)
+    ("BIG5" . big5)
+    ;("BIG5-HKSCS" . ??)
+    ;("GBK" . ??)
+    ;("GB18030" . ??)
+    ("SHIFT_JIS" . shift_jis)
+    ;("JOHAB" . ??)
+    ("TIS-620" . tis-620)    ; requires Emacs 20 or Emacs 21
+    ("VISCII" . viscii)      ; requires Emacs 20 or Emacs 21
+    ;("GEORGIAN-PS" . ??)
+    ("UTF-8" . utf-8)        ; requires Mule-UCS in Emacs 20, or Emacs 21
     )
   "How to convert a GNU libc/libiconv canonical charset name as seen in
 Content-Type into a Mule coding system.")
@@ -167,8 +171,8 @@ Content-Type into a Mule coding system.")
                                                    (1- (point))
                                                    (1- (+ (point) 4096)))))
          (setq short-read (< (nth 1 pair) 4096)))))
-    (cond (short-read nil)
-         ((re-search-forward charset-regexp nil t) (match-string 1))
+    (cond ((re-search-forward charset-regexp nil t) (match-string 1))
+         (short-read nil)
          ;; We've found the first msgid; maybe, only a part of the msgstr
          ;; value was loaded.  Load the next 1024 bytes; if charset still
          ;; isn't available, give up.
@@ -189,16 +193,30 @@ Called through file-coding-system-alist, before the file is visited for real."
        (and (eq operation 'insert-file-contents)
             (file-exists-p filename)
             (po-with-temp-buffer
-              (let ((coding-system-for-read 'no-conversion))
-                 (let* ((charset (or (po-find-charset filename)
-                                    "ascii"))
-                        (charset-upper (intern (upcase charset)))
-                        (charset-lower (intern (downcase charset))))
-                   (list (or (cdr (assq charset-upper
-                                        po-content-type-charset-alist))
-                             (if (memq charset-lower (coding-system-list))
-                                 charset-lower
-                               'no-conversion)))))))))
+             (let* ((coding-system-for-read 'no-conversion)
+                    (charset (or (po-find-charset filename) "ascii"))
+                    (charset-upper (upcase charset))
+                    (charset-lower (downcase charset))
+                    (candidate
+                     (cdr (assoc charset-upper po-content-type-charset-alist)))
+                    (try (or candidate (intern-soft charset-lower))))
+               (list (cond ((and try (coding-system-p try))
+                            try)
+                           ((and try
+                                 (string-match "\\`cp[1-9][0-9][0-9]?\\'"
+                                               (symbol-name try))
+                                 (assoc (substring (symbol-name try) 2)
+                                        (cp-supported-codepages)))
+                            (codepage-setup (substring (symbol-name try) 2))
+                            try)
+                           ((and (string-match "\\`cp[1-9][0-9][0-9]?\\'"
+                                               charset-lower)
+                                 (assoc (substring charset-lower 2)
+                                        (cp-supported-codepages)))
+                            (codepage-setup (substring charset-lower 2))
+                            (intern charset-lower))
+                           (t
+                            'no-conversion))))))))
 
   (if po-EMACS20
       (defun po-find-file-coding-system (arg-list)
@@ -214,7 +232,7 @@ Return a Mule (DECODING . ENCODING) pair, according to PO file charset.
 Called through file-coding-system-alist, before the file is visited for real."
        (po-find-file-coding-system-guts operation filename)))
 
- )
+  )
 
 (provide 'po-compat)