Merge from emacs--devo--0

[gnu-emacs] / lisp / international / mule-cmds.el

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index e0e7e8512c87656c8fed21c2e172ff6e39a401b2..fbdc0467f0022c40b843d847b03b7a5247482835 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1,8 +1,9 @@
 ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
-;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
@@ -841,7 +842,7 @@ and TO is ignored."
 
   (let ((no-other-defaults nil)
        auto-cs)
-    (unless (or (stringp from) find-file-literally)    
+    (unless (or (stringp from) find-file-literally)
       ;; Find an auto-coding that is specified for the the current
       ;; buffer and file from the region FROM and TO.
       (save-excursion
@@ -903,7 +904,7 @@ It is highly recommended to fix it before writing to a file."
                (rassq base default-coding-system)
                (setq default-coding-system
                      (append default-coding-system
-                             (list (cons default-buffer-file-coding-system 
+                             (list (cons default-buffer-file-coding-system
                                          base)))))))
 
       ;; If the most preferred coding system has the property mime-charset,
@@ -928,10 +929,10 @@ It is highly recommended to fix it before writing to a file."
        (let ((default-eol-type (coding-system-eol-type
                                 (caar default-coding-system))))
          (if (and (vectorp default-eol-type) buffer-file-coding-system)
-             (setq default-eol-type (coding-system-eol-type 
+             (setq default-eol-type (coding-system-eol-type
                                      buffer-file-coding-system)))
          (if (and (vectorp default-eol-type) default-buffer-file-coding-system)
-             (setq default-eol-type (coding-system-eol-type 
+             (setq default-eol-type (coding-system-eol-type
                                      default-buffer-file-coding-system)))
          (if (and default-eol-type (not (vectorp default-eol-type)))
              (dolist (elt default-coding-system)
@@ -1201,7 +1202,7 @@ in the European submenu in each of those two menus."
 
     (dolist (elt alist)
       (set-language-info-internal lang-env (car elt) (cdr elt)))
-    
+
     (if (equal lang-env current-language-environment)
        (set-language-environment lang-env))))
 
@@ -1324,10 +1325,8 @@ See the function `register-input-method' for the meanings of the elements.")
 
 (defun register-input-method (input-method lang-env &rest args)
   "Register INPUT-METHOD as an input method for language environment LANG-ENV.
-INPUT-METHOD and LANG-ENV are symbols or strings.
 
-The remaining arguments are:
-       ACTIVATE-FUNC, TITLE, DESCRIPTION, and ARGS...
+INPUT-METHOD and LANG-ENV are symbols or strings.
 ACTIVATE-FUNC is a function to call to activate this method.
 TITLE is a string to show in the mode line when this method is active.
 DESCRIPTION is a string describing this method and what it is good for.
@@ -1345,7 +1344,8 @@ string specified in this function takes precedence.)
 
 The commands `describe-input-method' and `list-input-methods' need
 these duplicated values to show some information about input methods
-without loading the relevant Quail packages."
+without loading the relevant Quail packages.
+\n(fn INPUT-METHOD LANG-ENV ACTIVATE-FUNC TITLE DESCRIPTION &rest ARGS)"
   (if (symbolp lang-env)
       (setq lang-env (symbol-name lang-env)))
   (if (symbolp input-method)
@@ -2552,7 +2552,11 @@ See also `locale-charset-language-names', `locale-language-names',
                   (not (coding-system-equal coding-system
                                             locale-coding-system)))
          (prefer-coding-system coding-system)
+         ;; Fixme: perhaps prefer-coding-system should set this too.
+         ;; But it's not the time to do such a fundamental change.
+         (setq default-sendmail-coding-system coding-system)
          (setq locale-coding-system coding-system))
+
        (when (get-language-info current-language-environment 'coding-priority)
          (let ((codeset (locale-info 'codeset))
                (coding-system (car (coding-system-priority-list))))