summaryrefslogtreecommitdiff
path: root/lisp/international
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2006-12-09 15:20:25 +0000
committerJuanma Barranquero <lekktu@gmail.com>2006-12-09 15:20:25 +0000
commitd35deeec4fd0016060202b584a56729590a02268 (patch)
tree677bcffbc023dcd1500c3e735158a7d928b526ea /lisp/international
parentc169c5a33b85c491fdbd07ebe890e4cce967ef57 (diff)
downloademacs-d35deeec4fd0016060202b584a56729590a02268.tar.gz
(register-input-method): Doc fix.
Diffstat (limited to 'lisp/international')
-rw-r--r--lisp/international/mule-cmds.el17
1 files changed, 8 insertions, 9 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index fc461bffe2c..413d969b932 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -859,7 +859,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
@@ -921,7 +921,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,
@@ -948,10 +948,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)
@@ -1235,7 +1235,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))))
@@ -1358,10 +1358,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.
@@ -1379,7 +1377,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)