[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.242.2.5 
emacs/lisp/international/mule-cmds.el:1.242.2.6
*** emacs/lisp/international/mule-cmds.el:1.242.2.5     Fri Apr 16 12:50:30 2004
--- emacs/lisp/international/mule-cmds.el       Mon Jun 28 07:29:47 2004
***************
*** 1030,1036 ****
  see `language-info-alist'."
    (if (symbolp lang-env)
        (setq lang-env (symbol-name lang-env)))
!   (let ((lang-slot (assoc-ignore-case lang-env language-info-alist)))
      (if lang-slot
        (cdr (assq key (cdr lang-slot))))))
  
--- 1030,1036 ----
  see `language-info-alist'."
    (if (symbolp lang-env)
        (setq lang-env (symbol-name lang-env)))
!   (let ((lang-slot (assoc-string lang-env language-info-alist t)))
      (if lang-slot
        (cdr (assq key (cdr lang-slot))))))
  
***************
*** 1587,1597 ****
    :link '(custom-manual "(emacs)Language Environments")
    :set (lambda (symbol value) (set-language-environment value))
    :get (lambda (x)
!        (or (car-safe (assoc-ignore-case
                        (if (symbolp current-language-environment)
                            (symbol-name current-language-environment)
                          current-language-environment)
!                       language-info-alist))
             "English"))
    ;; custom type will be updated with `set-language-info'.
    :type (if language-info-alist
--- 1587,1597 ----
    :link '(custom-manual "(emacs)Language Environments")
    :set (lambda (symbol value) (set-language-environment value))
    :get (lambda (x)
!        (or (car-safe (assoc-string
                        (if (symbolp current-language-environment)
                            (symbol-name current-language-environment)
                          current-language-environment)
!                       language-info-alist t))
             "English"))
    ;; custom type will be updated with `set-language-info'.
    :type (if language-info-alist
***************
*** 1696,1702 ****
        (if (symbolp language-name)
          (setq language-name (symbol-name language-name)))
      (setq language-name "English"))
!   (let ((slot (assoc-ignore-case language-name language-info-alist)))
      (unless slot
        (error "Language environment not defined: %S" language-name))
      (setq language-name (car slot)))
--- 1696,1702 ----
        (if (symbolp language-name)
          (setq language-name (symbol-name language-name)))
      (setq language-name "English"))
!   (let ((slot (assoc-string language-name language-info-alist t)))
      (unless slot
        (error "Language environment not defined: %S" language-name))
      (setq language-name (car slot)))
***************
*** 1860,1867 ****
                      ?3))
          ;; We suppress these setting for the moment because the
          ;; above assumption is wrong.
!         ;; (aset standard-display-table ?' [?,F"(B])
!         ;; (aset standard-display-table ?` [?,F!(B])
          ;; The fonts don't have the relevant bug.
          (aset standard-display-table 160 nil)
          (aset standard-display-table (make-char 'latin-iso8859-1 160)
--- 1860,1867 ----
                      ?3))
          ;; We suppress these setting for the moment because the
          ;; above assumption is wrong.
!         ;; (aset standard-display-table ?' [?$B!G(B])
!         ;; (aset standard-display-table ?` [?$B!F(B])
          ;; The fonts don't have the relevant bug.
          (aset standard-display-table 160 nil)
          (aset standard-display-table (make-char 'latin-iso8859-1 160)
***************
*** 2268,2274 ****
  the characters `-' and `_' as insignificant.  The coding system base
  is returned.  Thus, for instance, if charset \"ISO8859-2\",
  `iso-latin-2' is returned."
!   (or (car (assoc-ignore-case charset locale-charset-alist))
        (let ((cs coding-system-alist)
            c)
        (while (and (not c) cs)
--- 2268,2274 ----
  the characters `-' and `_' as insignificant.  The coding system base
  is returned.  Thus, for instance, if charset \"ISO8859-2\",
  `iso-latin-2' is returned."
!   (or (car (assoc-string charset locale-charset-alist t))
        (let ((cs coding-system-alist)
            c)
        (while (and (not c) cs)
***************
*** 2413,2418 ****
--- 2413,2428 ----
                  (message "Warning: Default coding system `%s' disagrees with
  system codeset `%s' for this locale." coding-system codeset))))))))
  
+     ;; On Windows, override locale-coding-system, keyboard-coding-system,
+     ;; selection-coding-system with system codepage.
+     (when (boundp 'w32-ansi-code-page)
+       (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page))))
+       (when (coding-system-p code-page-coding)
+         (setq locale-coding-system code-page-coding)
+         (set-selection-coding-system code-page-coding)
+         (set-keyboard-coding-system code-page-coding)
+         (set-terminal-coding-system code-page-coding))))
+ 
      ;; Default to A4 paper if we're not in a C, POSIX or US locale.
      ;; (See comments in Flocale_info.)
      (let ((locale locale)
***************
*** 2435,2441 ****
                                                ("posix$" . letter)
                                                (".._us" . letter)
                                                (".._pr" . letter)
!                                               (".._ca" . letter)))
                    'a4))))))
    nil)
  
--- 2445,2455 ----
                                                ("posix$" . letter)
                                                (".._us" . letter)
                                                (".._pr" . letter)
!                                               (".._ca" . letter)
!                                               ("enu$" . letter) ; Windows
!                                               ("esu$" . letter)
!                                               ("enc$" . letter)
!                                               ("frc$" . letter)))
                    'a4))))))
    nil)