[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el
From: |
Dave Love |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el |
Date: |
Fri, 14 Feb 2003 13:42:31 -0500 |
Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.223
emacs/lisp/international/mule-cmds.el:1.224
*** emacs/lisp/international/mule-cmds.el:1.223 Fri Feb 14 01:54:44 2003
--- emacs/lisp/international/mule-cmds.el Fri Feb 14 13:42:31 2003
***************
*** 1,8 ****
;;; mule-cmds.el --- commands for mulitilingual environment
-
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
! ;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
;; Keywords: mule, multilingual
--- 1,7 ----
;;; mule-cmds.el --- commands for mulitilingual environment
;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
! ;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
;; Keywords: mule, multilingual
***************
*** 1938,1944 ****
("ca" . "Latin-1") ; Catalan
; co Corsican
("cs" . "Czech")
! ("cy" . "Welsh") ; Welsh
("da" . "Latin-1") ; Danish
("de" . "German")
; dz Bhutani
--- 1937,1943 ----
("ca" . "Latin-1") ; Catalan
; co Corsican
("cs" . "Czech")
! ("cy" . "Welsh") ; Welsh [glibc uses Latin-8. Did this change?]
("da" . "Latin-1") ; Danish
("de" . "German")
; dz Bhutani
***************
*** 1974,1980 ****
; ie Interlingue
; ik Inupiak
("is" . "Latin-1") ; Icelandic
! ("it" . "Latin-1") ; Italian
; iu Inuktitut
("ja" . "Japanese")
; jw Javanese
--- 1973,1979 ----
; ie Interlingue
; ik Inupiak
("is" . "Latin-1") ; Icelandic
! ("it" . "Italian") ; Italian
; iu Inuktitut
("ja" . "Japanese")
; jw Javanese
***************
*** 2019,2025 ****
("rm" . "Latin-1") ; Rhaeto-Romanic
; rn Kirundi
("ro" . "Romanian")
! ("ru.*[_.]koi8" . "Cyrillic-KOI8") ; Russian
("ru" . "Cyrillic-ISO") ; Russian
; rw Kinyarwanda
("sa" . "Devanagari") ; Sanskrit
--- 2018,2024 ----
("rm" . "Latin-1") ; Rhaeto-Romanic
; rn Kirundi
("ro" . "Romanian")
! ("ru.*[_.]koi8" . "Russian")
("ru" . "Cyrillic-ISO") ; Russian
; rw Kinyarwanda
("sa" . "Devanagari") ; Sanskrit
***************
*** 2050,2056 ****
("tl" . "Latin-1") ; Tagalog
; tn Setswana
; to Tonga
! ("tr" . "Latin-5") ; Turkish
; ts Tsonga
; tt Tatar
; tw Twi
--- 2049,2055 ----
("tl" . "Latin-1") ; Tagalog
; tn Setswana
; to Tonga
! ("tr" . "Turkish")
; ts Tsonga
; tt Tatar
; tw Twi
***************
*** 2071,2082 ****
; zh_CN.GB18030/GB18030 \
; zh_CN.GBK/GBK \
; zh_HK/BIG5-HKSCS \
- ; zh_TW/BIG5 \
- ; zh_TW.EUC-TW/EUC-TW \
("zh.*[._]big5" . "Chinese-BIG5")
("zh.*[._]gbk" . nil) ; Solaris 2.7; has gbk-0 as well as GB 2312.1980-0
! ("zh_tw" . "Chinese-CNS")
("zh" . "Chinese-GB")
; zu Zulu
--- 2070,2080 ----
; zh_CN.GB18030/GB18030 \
; zh_CN.GBK/GBK \
; zh_HK/BIG5-HKSCS \
("zh.*[._]big5" . "Chinese-BIG5")
("zh.*[._]gbk" . nil) ; Solaris 2.7; has gbk-0 as well as GB 2312.1980-0
! ("zh_tw" . "Chinese-CNS") ; glibc uses big5
! ("zh_tw[._]euc-tw" . "Chinese-EUC-TW")
("zh" . "Chinese-GB")
; zu Zulu
***************
*** 2256,2262 ****
(when coding-system
(prefer-coding-system coding-system)
! (setq locale-coding-system coding-system))))))
;;; Charset property
--- 2254,2286 ----
(when coding-system
(prefer-coding-system coding-system)
! (setq locale-coding-system coding-system))))
!
! ;; Default to A4 paper if we're not in a C, POSIX or US locale.
! ;; (See comments in Flanginfo.)
! (let ((locale locale)
! (paper (langinfo 'paper)))
! (if paper
! ;; This will always be null at the time of writing.
! (cond
! ((equal paper '(216 279))
! (setq ps-paper-type 'letter))
! ((equal paper '(210 297))
! (setq ps-paper-type 'a4)))
! (let ((vars '("LC_ALL" "LC_PAPER" "LANG")))
! (while (and vars (= 0 (length locale)))
! (setq locale (getenv (pop vars)))))
! (when locale
! ;; As of glibc 2.2.5, these are the only US Letter locales,
! ;; and the rest are A4.
! (setq ps-paper-type
! (or (locale-name-match locale '(("c$" . letter)
! ("posix$" . letter)
! (".._us" . letter)
! (".._pr" . letter)
! (".._ca" . letter)))
! 'a4))))))
! nil)
;;; Charset property