/[emacs]/emacs/lisp/international/mule-cmds.el
ViewVC logotype

Diff of /emacs/lisp/international/mule-cmds.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.242.2.5 by handa, Fri Apr 16 12:50:30 2004 UTC revision 1.242.2.6 by miles, Mon Jun 28 07:29:47 2004 UTC
# Line 1030  For a list of useful values for KEY and Line 1030  For a list of useful values for KEY and
1030  see `language-info-alist'."  see `language-info-alist'."
1031    (if (symbolp lang-env)    (if (symbolp lang-env)
1032        (setq lang-env (symbol-name lang-env)))        (setq lang-env (symbol-name lang-env)))
1033    (let ((lang-slot (assoc-ignore-case lang-env language-info-alist)))    (let ((lang-slot (assoc-string lang-env language-info-alist t)))
1034      (if lang-slot      (if lang-slot
1035          (cdr (assq key (cdr lang-slot))))))          (cdr (assq key (cdr lang-slot))))))
1036    
# Line 1587  to using the function `set-language-envi Line 1587  to using the function `set-language-envi
1587    :link '(custom-manual "(emacs)Language Environments")    :link '(custom-manual "(emacs)Language Environments")
1588    :set (lambda (symbol value) (set-language-environment value))    :set (lambda (symbol value) (set-language-environment value))
1589    :get (lambda (x)    :get (lambda (x)
1590           (or (car-safe (assoc-ignore-case           (or (car-safe (assoc-string
1591                          (if (symbolp current-language-environment)                          (if (symbolp current-language-environment)
1592                              (symbol-name current-language-environment)                              (symbol-name current-language-environment)
1593                            current-language-environment)                            current-language-environment)
1594                          language-info-alist))                          language-info-alist t))
1595               "English"))               "English"))
1596    ;; custom type will be updated with `set-language-info'.    ;; custom type will be updated with `set-language-info'.
1597    :type (if language-info-alist    :type (if language-info-alist
# Line 1696  specifies the character set for the majo Line 1696  specifies the character set for the majo
1696        (if (symbolp language-name)        (if (symbolp language-name)
1697            (setq language-name (symbol-name language-name)))            (setq language-name (symbol-name language-name)))
1698      (setq language-name "English"))      (setq language-name "English"))
1699    (let ((slot (assoc-ignore-case language-name language-info-alist)))    (let ((slot (assoc-string language-name language-info-alist t)))
1700      (unless slot      (unless slot
1701        (error "Language environment not defined: %S" language-name))        (error "Language environment not defined: %S" language-name))
1702      (setq language-name (car slot)))      (setq language-name (car slot)))
# Line 1860  Setting this variable directly does not Line 1860  Setting this variable directly does not
1860                        ?3))                        ?3))
1861            ;; We suppress these setting for the moment because the            ;; We suppress these setting for the moment because the
1862            ;; above assumption is wrong.            ;; above assumption is wrong.
1863            ;; (aset standard-display-table ?' [?,F"(B])            ;; (aset standard-display-table ?' [?$B!G(B])
1864            ;; (aset standard-display-table ?` [?,F!(B])            ;; (aset standard-display-table ?` [?$B!F(B])
1865            ;; The fonts don't have the relevant bug.            ;; The fonts don't have the relevant bug.
1866            (aset standard-display-table 160 nil)            (aset standard-display-table 160 nil)
1867            (aset standard-display-table (make-char 'latin-iso8859-1 160)            (aset standard-display-table (make-char 'latin-iso8859-1 160)
# Line 2268  matches are looked for in the coding sys Line 2268  matches are looked for in the coding sys
2268  the characters `-' and `_' as insignificant.  The coding system base  the characters `-' and `_' as insignificant.  The coding system base
2269  is returned.  Thus, for instance, if charset \"ISO8859-2\",  is returned.  Thus, for instance, if charset \"ISO8859-2\",
2270  `iso-latin-2' is returned."  `iso-latin-2' is returned."
2271    (or (car (assoc-ignore-case charset locale-charset-alist))    (or (car (assoc-string charset locale-charset-alist t))
2272        (let ((cs coding-system-alist)        (let ((cs coding-system-alist)
2273              c)              c)
2274          (while (and (not c) cs)          (while (and (not c) cs)
# Line 2413  See also `locale-charset-language-names' Line 2413  See also `locale-charset-language-names'
2413                    (message "Warning: Default coding system `%s' disagrees with                    (message "Warning: Default coding system `%s' disagrees with
2414  system codeset `%s' for this locale." coding-system codeset))))))))  system codeset `%s' for this locale." coding-system codeset))))))))
2415    
2416        ;; On Windows, override locale-coding-system, keyboard-coding-system,
2417        ;; selection-coding-system with system codepage.
2418        (when (boundp 'w32-ansi-code-page)
2419          (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page))))
2420            (when (coding-system-p code-page-coding)
2421              (setq locale-coding-system code-page-coding)
2422              (set-selection-coding-system code-page-coding)
2423              (set-keyboard-coding-system code-page-coding)
2424              (set-terminal-coding-system code-page-coding))))
2425    
2426      ;; Default to A4 paper if we're not in a C, POSIX or US locale.      ;; Default to A4 paper if we're not in a C, POSIX or US locale.
2427      ;; (See comments in Flocale_info.)      ;; (See comments in Flocale_info.)
2428      (let ((locale locale)      (let ((locale locale)
# Line 2435  system codeset `%s' for this locale." co Line 2445  system codeset `%s' for this locale." co
2445                                                  ("posix$" . letter)                                                  ("posix$" . letter)
2446                                                  (".._us" . letter)                                                  (".._us" . letter)
2447                                                  (".._pr" . letter)                                                  (".._pr" . letter)
2448                                                  (".._ca" . letter)))                                                  (".._ca" . letter)
2449                                                    ("enu$" . letter) ; Windows
2450                                                    ("esu$" . letter)
2451                                                    ("enc$" . letter)
2452                                                    ("frc$" . letter)))
2453                      'a4))))))                      'a4))))))
2454    nil)    nil)
2455    

Legend:
Removed from v.1.242.2.5  
changed lines
  Added in v.1.242.2.6

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26