emacs: lisp/international/mule-cmds.el comparison

comparison lisp/international/mule-cmds.el @ 90729:6588c6259dfb

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 545-562) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - erc-iswitchb: Temporarily enable iswitchb mode * gnus--rel--5.10 (patch 172-176) - Merge from emacs--devo--0 - Update from CVS - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156

author	Miles Bader <miles@gnu.org>
date	Sat, 16 Dec 2006 01:29:26 +0000
parents	4bcfe4827e45 2408d46ef69e
children	bc10a33dd40b

comparison

equal deleted inserted replaced

-:a65a92d83186
+:6588c6259dfb
 ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   Free Software Foundation, Inc.
+;;   2006  Free Software Foundation, Inc.
-;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; 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
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 	   (not (listp default-coding-system)))
 (setq default-coding-system (list default-coding-system)))
 (let ((no-other-defaults nil)
 	auto-cs)
 (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
 	(save-restriction
 	  (widen)
 	  (let ((base (coding-system-base default-buffer-file-coding-system)))
 	    (or (eq base 'undecided)
 		(rassq base default-coding-system)
 		(setq default-coding-system
 		      (append default-coding-system
 			      (list (cons default-buffer-file-coding-system
 					  base)))))))
 ;; If the most preferred coding system has the property mime-charset,
 ;; append it to the defaults.
 (let ((preferred (coding-system-priority-list t))
 ;; default-buffer-file-coding-system.
 (if default-coding-system
 	(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
 				      buffer-file-coding-system)))
 	  (if (and (vectorp default-eol-type) default-buffer-file-coding-system)
 	      (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)
 		(setcar elt (coding-system-change-eol-conversion
 			     (car elt) default-eol-type))))))
 (define-key-after setup-map (vector (intern lang-env))
 (cons lang-env 'setup-specified-language-environment) t)
 (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))))
 (defun read-language-name (key prompt &optional default)
 "Read a language environment name which has information for KEY.
 (INPUT-METHOD LANGUAGE-ENV ACTIVATE-FUNC TITLE DESCRIPTION ARGS...)
 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...
 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.
 The ARGS, if any, are passed as arguments to ACTIVATE-FUNC.
 All told, the arguments to ACTIVATE-FUNC are INPUT-METHOD and the ARGS.
 parameter of `quail-define-package'.  (If the values are different, the
 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)
 (setq input-method (symbol-name input-method)))
 (let ((info (cons lang-env args))
 	(when (and coding-system
 		   (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))))
 	    (when codeset
 	      (let ((cs (coding-system-aliases coding-system))

Mercurial > emacs

comparison lisp/international/mule-cmds.el @ 90729:6588c6259dfb