diff options
| author | Juanma Barranquero | 2006-12-09 15:20:25 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-12-09 15:20:25 +0000 |
| commit | d35deeec4fd0016060202b584a56729590a02268 (patch) | |
| tree | 677bcffbc023dcd1500c3e735158a7d928b526ea | |
| parent | c169c5a33b85c491fdbd07ebe890e4cce967ef57 (diff) | |
| download | emacs-d35deeec4fd0016060202b584a56729590a02268.tar.gz emacs-d35deeec4fd0016060202b584a56729590a02268.zip | |
(register-input-method): Doc fix.
| -rw-r--r-- | lisp/international/mule-cmds.el | 17 |
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." | |||
| 859 | 859 | ||
| 860 | (let ((no-other-defaults nil) | 860 | (let ((no-other-defaults nil) |
| 861 | auto-cs) | 861 | auto-cs) |
| 862 | (unless (or (stringp from) find-file-literally) | 862 | (unless (or (stringp from) find-file-literally) |
| 863 | ;; Find an auto-coding that is specified for the the current | 863 | ;; Find an auto-coding that is specified for the the current |
| 864 | ;; buffer and file from the region FROM and TO. | 864 | ;; buffer and file from the region FROM and TO. |
| 865 | (save-excursion | 865 | (save-excursion |
| @@ -921,7 +921,7 @@ It is highly recommended to fix it before writing to a file." | |||
| 921 | (rassq base default-coding-system) | 921 | (rassq base default-coding-system) |
| 922 | (setq default-coding-system | 922 | (setq default-coding-system |
| 923 | (append default-coding-system | 923 | (append default-coding-system |
| 924 | (list (cons default-buffer-file-coding-system | 924 | (list (cons default-buffer-file-coding-system |
| 925 | base))))))) | 925 | base))))))) |
| 926 | 926 | ||
| 927 | ;; If the most preferred coding system has the property mime-charset, | 927 | ;; 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." | |||
| 948 | (let ((default-eol-type (coding-system-eol-type | 948 | (let ((default-eol-type (coding-system-eol-type |
| 949 | (caar default-coding-system)))) | 949 | (caar default-coding-system)))) |
| 950 | (if (and (vectorp default-eol-type) buffer-file-coding-system) | 950 | (if (and (vectorp default-eol-type) buffer-file-coding-system) |
| 951 | (setq default-eol-type (coding-system-eol-type | 951 | (setq default-eol-type (coding-system-eol-type |
| 952 | buffer-file-coding-system))) | 952 | buffer-file-coding-system))) |
| 953 | (if (and (vectorp default-eol-type) default-buffer-file-coding-system) | 953 | (if (and (vectorp default-eol-type) default-buffer-file-coding-system) |
| 954 | (setq default-eol-type (coding-system-eol-type | 954 | (setq default-eol-type (coding-system-eol-type |
| 955 | default-buffer-file-coding-system))) | 955 | default-buffer-file-coding-system))) |
| 956 | (if (and default-eol-type (not (vectorp default-eol-type))) | 956 | (if (and default-eol-type (not (vectorp default-eol-type))) |
| 957 | (dolist (elt default-coding-system) | 957 | (dolist (elt default-coding-system) |
| @@ -1235,7 +1235,7 @@ in the European submenu in each of those two menus." | |||
| 1235 | 1235 | ||
| 1236 | (dolist (elt alist) | 1236 | (dolist (elt alist) |
| 1237 | (set-language-info-internal lang-env (car elt) (cdr elt))) | 1237 | (set-language-info-internal lang-env (car elt) (cdr elt))) |
| 1238 | 1238 | ||
| 1239 | (if (equal lang-env current-language-environment) | 1239 | (if (equal lang-env current-language-environment) |
| 1240 | (set-language-environment lang-env)))) | 1240 | (set-language-environment lang-env)))) |
| 1241 | 1241 | ||
| @@ -1358,10 +1358,8 @@ See the function `register-input-method' for the meanings of the elements.") | |||
| 1358 | 1358 | ||
| 1359 | (defun register-input-method (input-method lang-env &rest args) | 1359 | (defun register-input-method (input-method lang-env &rest args) |
| 1360 | "Register INPUT-METHOD as an input method for language environment LANG-ENV. | 1360 | "Register INPUT-METHOD as an input method for language environment LANG-ENV. |
| 1361 | INPUT-METHOD and LANG-ENV are symbols or strings. | ||
| 1362 | 1361 | ||
| 1363 | The remaining arguments are: | 1362 | INPUT-METHOD and LANG-ENV are symbols or strings. |
| 1364 | ACTIVATE-FUNC, TITLE, DESCRIPTION, and ARGS... | ||
| 1365 | ACTIVATE-FUNC is a function to call to activate this method. | 1363 | ACTIVATE-FUNC is a function to call to activate this method. |
| 1366 | TITLE is a string to show in the mode line when this method is active. | 1364 | TITLE is a string to show in the mode line when this method is active. |
| 1367 | DESCRIPTION is a string describing this method and what it is good for. | 1365 | DESCRIPTION is a string describing this method and what it is good for. |
| @@ -1379,7 +1377,8 @@ string specified in this function takes precedence.) | |||
| 1379 | 1377 | ||
| 1380 | The commands `describe-input-method' and `list-input-methods' need | 1378 | The commands `describe-input-method' and `list-input-methods' need |
| 1381 | these duplicated values to show some information about input methods | 1379 | these duplicated values to show some information about input methods |
| 1382 | without loading the relevant Quail packages." | 1380 | without loading the relevant Quail packages. |
| 1381 | \n(fn INPUT-METHOD LANG-ENV ACTIVATE-FUNC TITLE DESCRIPTION &rest ARGS)" | ||
| 1383 | (if (symbolp lang-env) | 1382 | (if (symbolp lang-env) |
| 1384 | (setq lang-env (symbol-name lang-env))) | 1383 | (setq lang-env (symbol-name lang-env))) |
| 1385 | (if (symbolp input-method) | 1384 | (if (symbolp input-method) |