Obsolete alias inactivate-current-input-method-function.

[bpt/emacs.git] / lisp / international / mule-cmds.el

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5a3f724..30dc88a 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1331,6 +1331,9 @@ of `history-length', which see.")
 (make-variable-buffer-local 'input-method-history)
 (put 'input-method-history 'permanent-local t)
 
+(define-obsolete-variable-alias
+  'inactivate-current-input-method-function
+  'deactivate-current-input-method-function "24.2")
 (defvar deactivate-current-input-method-function nil
   "Function to call for deactivating the current input method.
 Every input method should set this to an appropriate value when activated.
@@ -1468,6 +1471,10 @@ If INPUT-METHOD is nil, deactivate any current input method."
        (setq current-input-method nil)
        (force-mode-line-update)))))
 
+(define-obsolete-function-alias
+  'inactivate-input-method
+  'deactivate-input-method "24.2")
+
 (defun set-input-method (input-method &optional interactive)
   "Select and activate input method INPUT-METHOD for the current buffer.
 This also sets the default input method to the one you specify.
@@ -2662,32 +2669,14 @@ See also `locale-charset-language-names', `locale-language-names',
 
     ;; On Windows, override locale-coding-system,
     ;; default-file-name-coding-system, keyboard-coding-system,
-    ;; terminal-coding-system with the appropriate codepages.
+    ;; terminal-coding-system with system codepage.
     (when (boundp 'w32-ansi-code-page)
-      (let ((ansi-code-page-coding (intern (format "cp%d" w32-ansi-code-page)))
-           (oem-code-page-coding
-            (intern (format "cp%d" (w32-get-console-codepage))))
-           (oem-code-page-output-coding
-            (intern (format "cp%d" (w32-get-console-output-codepage))))
-           ansi-cs-p oem-cs-p oem-o-cs-p)
-       (setq ansi-cs-p (coding-system-p ansi-code-page-coding))
-       (setq oem-cs-p (coding-system-p oem-code-page-coding))
-       (setq oem-o-cs-p (coding-system-p oem-code-page-output-coding))
-       ;; Set the keyboard and display encoding to either the current
-       ;; ANSI codepage of the OEM codepage, depending on whether
-       ;; this is a GUI or a TTY frame.
-       (when ansi-cs-p
-         (unless frame (setq locale-coding-system ansi-code-page-coding))
-         (when (display-graphic-p frame)
-           (set-keyboard-coding-system ansi-code-page-coding frame)
-           (set-terminal-coding-system ansi-code-page-coding frame))
-         (setq default-file-name-coding-system ansi-code-page-coding))
-       (when oem-cs-p
-         (unless (display-graphic-p frame)
-           (set-keyboard-coding-system oem-code-page-coding frame)
-           (set-terminal-coding-system
-            (if oem-o-cs-p oem-code-page-output-coding oem-code-page-coding)
-            frame)))))
+      (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page))))
+       (when (coding-system-p code-page-coding)
+         (unless frame (setq locale-coding-system code-page-coding))
+         (set-keyboard-coding-system code-page-coding frame)
+         (set-terminal-coding-system code-page-coding frame)
+         (setq default-file-name-coding-system code-page-coding))))
 
     (when (eq system-type 'darwin)
       ;; On Darwin, file names are always encoded in utf-8, no matter