diff options
| author | Karl Heuer | 1998-09-06 14:31:49 +0000 |
|---|---|---|
| committer | Karl Heuer | 1998-09-06 14:31:49 +0000 |
| commit | e8dd0160fa39d450de09febd4bcf0ff4f821a0f0 (patch) | |
| tree | 8918b1357792c5919832885f6ba3697a4d36f80a | |
| parent | 8d9fbccc36cf7575bd2dcfa44845e34bab0e2c54 (diff) | |
| download | emacs-e8dd0160fa39d450de09febd4bcf0ff4f821a0f0.tar.gz emacs-e8dd0160fa39d450de09febd4bcf0ff4f821a0f0.zip | |
Doc fixes.
| -rw-r--r-- | lisp/international/ccl.el | 6 | ||||
| -rw-r--r-- | lisp/international/encoded-kb.el | 8 | ||||
| -rw-r--r-- | lisp/international/fontset.el | 18 | ||||
| -rw-r--r-- | lisp/international/kinsoku.el | 2 | ||||
| -rw-r--r-- | lisp/international/kkc.el | 2 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 16 | ||||
| -rw-r--r-- | lisp/international/mule-conf.el | 2 | ||||
| -rw-r--r-- | lisp/international/mule-util.el | 20 | ||||
| -rw-r--r-- | lisp/international/mule.el | 18 |
9 files changed, 46 insertions, 46 deletions
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index e0b12e35abe..b232ede8426 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el | |||
| @@ -100,7 +100,7 @@ | |||
| 100 | ;; | < | > | == | <= | >= | != | de-sjis | en-sjis | 100 | ;; | < | > | == | <= | >= | != | de-sjis | en-sjis |
| 101 | ;; ASSIGNMENT_OPERATOR := | 101 | ;; ASSIGNMENT_OPERATOR := |
| 102 | ;; += | -= | *= | /= | %= | &= | '|=' | ^= | <<= | >>= | 102 | ;; += | -= | *= | /= | %= | &= | '|=' | ^= | <<= | >>= |
| 103 | ;; ARRAY := '[' interger ... ']' | 103 | ;; ARRAY := '[' integer ... ']' |
| 104 | 104 | ||
| 105 | ;;; Code: | 105 | ;;; Code: |
| 106 | 106 | ||
| @@ -332,7 +332,7 @@ | |||
| 332 | 332 | ||
| 333 | ;;;###autoload | 333 | ;;;###autoload |
| 334 | (defun ccl-compile (ccl-program) | 334 | (defun ccl-compile (ccl-program) |
| 335 | "Return a comiled code of CCL-PROGRAM as a vector of integer." | 335 | "Return a compiled code of CCL-PROGRAM as a vector of integer." |
| 336 | (if (or (null (consp ccl-program)) | 336 | (if (or (null (consp ccl-program)) |
| 337 | (null (integerp (car ccl-program))) | 337 | (null (integerp (car ccl-program))) |
| 338 | (null (listp (car (cdr ccl-program))))) | 338 | (null (listp (car (cdr ccl-program))))) |
| @@ -1321,7 +1321,7 @@ register CCL-PROGRAM by name NAME, and return NAME." | |||
| 1321 | ;;;###autoload | 1321 | ;;;###autoload |
| 1322 | (defun ccl-execute-with-args (ccl-prog &rest args) | 1322 | (defun ccl-execute-with-args (ccl-prog &rest args) |
| 1323 | "Execute CCL-PROGRAM with registers initialized by the remaining args. | 1323 | "Execute CCL-PROGRAM with registers initialized by the remaining args. |
| 1324 | The return value is a vector of resulting CCL registeres." | 1324 | The return value is a vector of resulting CCL registers." |
| 1325 | (let ((reg (make-vector 8 0)) | 1325 | (let ((reg (make-vector 8 0)) |
| 1326 | (i 0)) | 1326 | (i 0)) |
| 1327 | (while (and args (< i 8)) | 1327 | (while (and args (< i 8)) |
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el index e23d9c4bd75..dda5190707e 100644 --- a/lisp/international/encoded-kb.el +++ b/lisp/international/encoded-kb.el | |||
| @@ -118,7 +118,7 @@ | |||
| 118 | (put 'encoded-kbd-iso2022-invocations 'permanent-local t) | 118 | (put 'encoded-kbd-iso2022-invocations 'permanent-local t) |
| 119 | 119 | ||
| 120 | (defun encoded-kbd-iso2022-designation () | 120 | (defun encoded-kbd-iso2022-designation () |
| 121 | "Do ISO2022 designation according to the curren key in Encoded-kbd mode. | 121 | "Do ISO2022 designation according to the current key in Encoded-kbd mode. |
| 122 | The following key sequence may cause multilingual text insertion." | 122 | The following key sequence may cause multilingual text insertion." |
| 123 | (interactive) | 123 | (interactive) |
| 124 | (let ((key-seq (this-command-keys)) | 124 | (let ((key-seq (this-command-keys)) |
| @@ -156,16 +156,16 @@ The following key sequence may cause multilingual text insertion." | |||
| 156 | ;; Graphic plane 0 (0x20..0x7f) is for ASCII. We don't have | 156 | ;; Graphic plane 0 (0x20..0x7f) is for ASCII. We don't have |
| 157 | ;; to handle characters in this range specially. | 157 | ;; to handle characters in this range specially. |
| 158 | (if (not (memq prev-g0-charset '(ascii latin-jisx0201))) | 158 | (if (not (memq prev-g0-charset '(ascii latin-jisx0201))) |
| 159 | ;; We must exit recusive edit now. | 159 | ;; We must exit recursive edit now. |
| 160 | (throw 'exit nil)) | 160 | (throw 'exit nil)) |
| 161 | ;; Graphic plane 0 is for non-ASCII. | 161 | ;; Graphic plane 0 is for non-ASCII. |
| 162 | (if (memq prev-g0-charset '(ascii latin-jisx0201)) | 162 | (if (memq prev-g0-charset '(ascii latin-jisx0201)) |
| 163 | ;; We must handle kyes specially. | 163 | ;; We must handle keys specially. |
| 164 | (let ((overriding-local-map encoded-kbd-iso2022-non-ascii-map)) | 164 | (let ((overriding-local-map encoded-kbd-iso2022-non-ascii-map)) |
| 165 | (recursive-edit)))))) | 165 | (recursive-edit)))))) |
| 166 | 166 | ||
| 167 | (defun encoded-kbd-handle-8bit () | 167 | (defun encoded-kbd-handle-8bit () |
| 168 | "Handle an 8-bit character enterned in Encoded-kbd mode." | 168 | "Handle an 8-bit character entered in Encoded-kbd mode." |
| 169 | (interactive) | 169 | (interactive) |
| 170 | (cond ((eq encoded-kbd-coding 'iso2022-7) | 170 | (cond ((eq encoded-kbd-coding 'iso2022-7) |
| 171 | (error "Can't handle the character code %d" last-command-char)) | 171 | (error "Can't handle the character code %d" last-command-char)) |
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 06c5ada9d25..aaa53d88fe5 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el | |||
| @@ -27,10 +27,10 @@ | |||
| 27 | ;; Set standard REGISTRY property of charset to find an appropriate | 27 | ;; Set standard REGISTRY property of charset to find an appropriate |
| 28 | ;; font for each charset. This is used to generate a font name in a | 28 | ;; font for each charset. This is used to generate a font name in a |
| 29 | ;; fontset. If the value contains a character `-', the string before | 29 | ;; fontset. If the value contains a character `-', the string before |
| 30 | ;; that is embeded in `CHARSET_REGISTRY' field, and the string after | 30 | ;; that is embedded in `CHARSET_REGISTRY' field, and the string after |
| 31 | ;; that is embeded in `CHARSET_ENCODING' field. If the value does not | 31 | ;; that is embedded in `CHARSET_ENCODING' field. If the value does not |
| 32 | ;; contain `-', the whole string is embeded in `CHARSET_REGISTRY' | 32 | ;; contain `-', the whole string is embedded in `CHARSET_REGISTRY' |
| 33 | ;; field, and a wild card character `*' is embeded in | 33 | ;; field, and a wild card character `*' is embedded in |
| 34 | ;; `CHARSET_ENCODING' field. | 34 | ;; `CHARSET_ENCODING' field. |
| 35 | 35 | ||
| 36 | (defvar x-charset-registries | 36 | (defvar x-charset-registries |
| @@ -327,7 +327,7 @@ automatically." | |||
| 327 | (let ((l x-font-name-charset-alist)) | 327 | (let ((l x-font-name-charset-alist)) |
| 328 | ;; If the ASCII font can also be used for another | 328 | ;; If the ASCII font can also be used for another |
| 329 | ;; charsets, use that font instead of what generated based | 329 | ;; charsets, use that font instead of what generated based |
| 330 | ;; on x-charset-registery in the previous code. | 330 | ;; on x-charset-registry in the previous code. |
| 331 | (while l | 331 | (while l |
| 332 | (if (string-match (car (car l)) ascii-font) | 332 | (if (string-match (car (car l)) ascii-font) |
| 333 | (let ((charsets (cdr (car l)))) | 333 | (let ((charsets (cdr (car l)))) |
| @@ -530,7 +530,7 @@ It returns a name of the created fontset." | |||
| 530 | (or font | 530 | (or font |
| 531 | (x-modify-font-name resolved-ascii-font style))) | 531 | (x-modify-font-name resolved-ascii-font style))) |
| 532 | ;; but leave fonts for the other charsets unmodified | 532 | ;; but leave fonts for the other charsets unmodified |
| 533 | ;; for the momemnt. They are modified for the style | 533 | ;; for the moment. They are modified for the style |
| 534 | ;; in instantiate-fontset. | 534 | ;; in instantiate-fontset. |
| 535 | (setq uninstantiated-fontset-alist | 535 | (setq uninstantiated-fontset-alist |
| 536 | (cons (list new-name | 536 | (cons (list new-name |
| @@ -557,8 +557,8 @@ Optional 2nd arg FONTSET-NAME is a string to be used in | |||
| 557 | an appropriate name is generated automatically. | 557 | an appropriate name is generated automatically. |
| 558 | 558 | ||
| 559 | Style variants of the fontset is created too. Font names in the | 559 | Style variants of the fontset is created too. Font names in the |
| 560 | variants are generated automatially from FONT unless X resources | 560 | variants are generated automatically from FONT unless X resources |
| 561 | XXX.attribyteFont explicitly specify them. | 561 | XXX.attributeFont explicitly specify them. |
| 562 | 562 | ||
| 563 | It returns a name of the created fontset." | 563 | It returns a name of the created fontset." |
| 564 | (or resolved-font | 564 | (or resolved-font |
| @@ -602,7 +602,7 @@ It returns a name of the created fontset." | |||
| 602 | styles)))) | 602 | styles)))) |
| 603 | 603 | ||
| 604 | (defun instantiate-fontset (fontset) | 604 | (defun instantiate-fontset (fontset) |
| 605 | "Make FONTSET be readly to use. | 605 | "Make FONTSET be ready to use. |
| 606 | FONTSET should be in the variable `uninstantiated-fontset-alist' in advance. | 606 | FONTSET should be in the variable `uninstantiated-fontset-alist' in advance. |
| 607 | Return FONTSET if it is created successfully, else return nil." | 607 | Return FONTSET if it is created successfully, else return nil." |
| 608 | (let ((fontset-data (assoc fontset uninstantiated-fontset-alist))) | 608 | (let ((fontset-data (assoc fontset uninstantiated-fontset-alist))) |
diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el index 53c26f7d593..96ac532c9ac 100644 --- a/lisp/international/kinsoku.el +++ b/lisp/international/kinsoku.el | |||
| @@ -47,7 +47,7 @@ The value 0 means there's no limitation.") | |||
| 47 | ;; ASCII | 47 | ;; ASCII |
| 48 | "!)-_~}]:;',.?" | 48 | "!)-_~}]:;',.?" |
| 49 | ;; Latin JISX0201 | 49 | ;; Latin JISX0201 |
| 50 | ;; Instead of putting Latin JISX0201 string directyly, we | 50 | ;; Instead of putting Latin JISX0201 string directly, we |
| 51 | ;; generate the string as below to avoid character | 51 | ;; generate the string as below to avoid character |
| 52 | ;; unification problem. | 52 | ;; unification problem. |
| 53 | (let* ((str1 "!)-_~}]:;',.?") | 53 | (let* ((str1 "!)-_~}]:;',.?") |
diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el index 8b872630d5d..6338dc10ed8 100644 --- a/lisp/international/kkc.el +++ b/lisp/international/kkc.el | |||
| @@ -237,7 +237,7 @@ and the return value is the length of the conversion." | |||
| 237 | (goto-char to) | 237 | (goto-char to) |
| 238 | (kkc-update-conversion 'all) | 238 | (kkc-update-conversion 'all) |
| 239 | 239 | ||
| 240 | ;; Then, ask users to selecte a desirable conversion. | 240 | ;; Then, ask users to select a desirable conversion. |
| 241 | (force-mode-line-update) | 241 | (force-mode-line-update) |
| 242 | (setq kkc-converting t) | 242 | (setq kkc-converting t) |
| 243 | (while kkc-converting | 243 | (while kkc-converting |
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 22d52eb7502..a41ec0503ee 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el | |||
| @@ -269,7 +269,7 @@ Comparison done with EQ." | |||
| 269 | All coding systems in the list can safely encode any multibyte characters | 269 | All coding systems in the list can safely encode any multibyte characters |
| 270 | in the text. | 270 | in the text. |
| 271 | 271 | ||
| 272 | If the text contains no multibyte charcters, return a list of a single | 272 | If the text contains no multibyte characters, return a list of a single |
| 273 | element `undecided'." | 273 | element `undecided'." |
| 274 | (find-coding-systems-for-charsets (find-charset-region from to))) | 274 | (find-coding-systems-for-charsets (find-charset-region from to))) |
| 275 | 275 | ||
| @@ -278,7 +278,7 @@ element `undecided'." | |||
| 278 | All coding systems in the list can safely encode any multibyte characters | 278 | All coding systems in the list can safely encode any multibyte characters |
| 279 | in STRING. | 279 | in STRING. |
| 280 | 280 | ||
| 281 | If STRING contains no multibyte charcters, return a list of a single | 281 | If STRING contains no multibyte characters, return a list of a single |
| 282 | element `undecided'." | 282 | element `undecided'." |
| 283 | (find-coding-systems-for-charsets (find-charset-string string))) | 283 | (find-coding-systems-for-charsets (find-charset-string string))) |
| 284 | 284 | ||
| @@ -329,7 +329,7 @@ where | |||
| 329 | COUNT is a number of characters, | 329 | COUNT is a number of characters, |
| 330 | CHARs are found characters of the character set. | 330 | CHARs are found characters of the character set. |
| 331 | Optional 3rd arg MAXCOUNT limits how many CHARs are put in the above list. | 331 | Optional 3rd arg MAXCOUNT limits how many CHARs are put in the above list. |
| 332 | Optioanl 4th arg EXCLUDE is a list of character sets to be ignored." | 332 | Optional 4th arg EXCLUDE is a list of character sets to be ignored." |
| 333 | (let ((chars nil) | 333 | (let ((chars nil) |
| 334 | charset char) | 334 | charset char) |
| 335 | (if (stringp from) | 335 | (if (stringp from) |
| @@ -561,7 +561,7 @@ globally disabled, i.e. the value of `default-enable-multibyte-characters' | |||
| 561 | is nil. | 561 | is nil. |
| 562 | 562 | ||
| 563 | unibyte-syntax value is a library name to load to set | 563 | unibyte-syntax value is a library name to load to set |
| 564 | unibyte 8-bit charcater syntaxes for this | 564 | unibyte 8-bit character syntaxes for this |
| 565 | language environment. | 565 | language environment. |
| 566 | 566 | ||
| 567 | unibyte-display value is a coding system to encode characters | 567 | unibyte-display value is a coding system to encode characters |
| @@ -685,7 +685,7 @@ Emacs loads this file at startup time.") | |||
| 685 | ;;; %s -- list of LEIM (Library of Emacs Input Method) | 685 | ;;; %s -- list of LEIM (Library of Emacs Input Method) |
| 686 | ;; | 686 | ;; |
| 687 | ;; This file contains a list of LEIM (Library of Emacs Input Method) | 687 | ;; This file contains a list of LEIM (Library of Emacs Input Method) |
| 688 | ;; in the same directory as this file. Loading this file registeres | 688 | ;; in the same directory as this file. Loading this file registers |
| 689 | ;; the whole input methods in Emacs. | 689 | ;; the whole input methods in Emacs. |
| 690 | ;; | 690 | ;; |
| 691 | ;; Each entry has the form: | 691 | ;; Each entry has the form: |
| @@ -1017,7 +1017,7 @@ But, if this flag is non-nil, it displays them in echo area instead.") | |||
| 1017 | "This flag controls the behaviour of an input method on invalid key input. | 1017 | "This flag controls the behaviour of an input method on invalid key input. |
| 1018 | Usually, when a user types a key which doesn't start any character | 1018 | Usually, when a user types a key which doesn't start any character |
| 1019 | handled by the input method, the key is handled by turning off the | 1019 | handled by the input method, the key is handled by turning off the |
| 1020 | input method temporarily. After that key, the input method is renabled. | 1020 | input method temporarily. After that key, the input method is re-enabled. |
| 1021 | But, if this flag is non-nil, the input method is never back on.") | 1021 | But, if this flag is non-nil, the input method is never back on.") |
| 1022 | 1022 | ||
| 1023 | 1023 | ||
| @@ -1034,7 +1034,7 @@ cancel the effect.") | |||
| 1034 | When this hook is run, the variable `current-language-environment' | 1034 | When this hook is run, the variable `current-language-environment' |
| 1035 | is still bound to the language environment being exited. | 1035 | is still bound to the language environment being exited. |
| 1036 | 1036 | ||
| 1037 | This hook is mainly used for cancelling the effect of | 1037 | This hook is mainly used for canceling the effect of |
| 1038 | `set-language-environment-hook' (which-see).") | 1038 | `set-language-environment-hook' (which-see).") |
| 1039 | 1039 | ||
| 1040 | (defun setup-specified-language-environment () | 1040 | (defun setup-specified-language-environment () |
| @@ -1080,7 +1080,7 @@ The default status is as follows: | |||
| 1080 | coding-category-sjis japanese-shift-jis | 1080 | coding-category-sjis japanese-shift-jis |
| 1081 | coding-category-big5 chinese-big5 | 1081 | coding-category-big5 chinese-big5 |
| 1082 | coding-category-ccl nil | 1082 | coding-category-ccl nil |
| 1083 | coding-category-binarry no-conversion | 1083 | coding-category-binary no-conversion |
| 1084 | " | 1084 | " |
| 1085 | (interactive) | 1085 | (interactive) |
| 1086 | ;; This function formerly set default-enable-multibyte-characters to t, | 1086 | ;; This function formerly set default-enable-multibyte-characters to t, |
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index bda1267a3cd..c7489b642f3 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el | |||
| @@ -304,7 +304,7 @@ | |||
| 304 | '((safe-charsets ascii))) | 304 | '((safe-charsets ascii))) |
| 305 | 305 | ||
| 306 | ;; Use iso-safe for terminal output if some other coding system is not | 306 | ;; Use iso-safe for terminal output if some other coding system is not |
| 307 | ;; specified explicitely. | 307 | ;; specified explicitly. |
| 308 | (set-safe-terminal-coding-system-internal 'iso-safe) | 308 | (set-safe-terminal-coding-system-internal 'iso-safe) |
| 309 | 309 | ||
| 310 | ;; The other coding-systems are defined in each language specific | 310 | ;; The other coding-systems are defined in each language specific |
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index 96a69730583..39eb9e3a9b1 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el | |||
| @@ -124,7 +124,7 @@ the resulting string may be narrower than END-COLUMN." | |||
| 124 | (concat head-padding str tail-padding) | 124 | (concat head-padding str tail-padding) |
| 125 | str)))) | 125 | str)))) |
| 126 | 126 | ||
| 127 | ;;; For backward compatiblity ... | 127 | ;;; For backward compatibility ... |
| 128 | ;;;###autoload | 128 | ;;;###autoload |
| 129 | (defalias 'truncate-string 'truncate-string-to-width) | 129 | (defalias 'truncate-string 'truncate-string-to-width) |
| 130 | (make-obsolete 'truncate-string 'truncate-string-to-width) | 130 | (make-obsolete 'truncate-string 'truncate-string-to-width) |
| @@ -134,7 +134,7 @@ the resulting string may be narrower than END-COLUMN." | |||
| 134 | 134 | ||
| 135 | ;;;###autoload | 135 | ;;;###autoload |
| 136 | (defsubst nested-alist-p (obj) | 136 | (defsubst nested-alist-p (obj) |
| 137 | "Return t if OBJ is a nesetd alist. | 137 | "Return t if OBJ is a nested alist. |
| 138 | 138 | ||
| 139 | Nested alist is a list of the form (ENTRY . BRANCHES), where ENTRY is | 139 | Nested alist is a list of the form (ENTRY . BRANCHES), where ENTRY is |
| 140 | any Lisp object, and BRANCHES is a list of cons cells of the form | 140 | any Lisp object, and BRANCHES is a list of cons cells of the form |
| @@ -148,13 +148,13 @@ can be a string, a vector, or a list." | |||
| 148 | ;;;###autoload | 148 | ;;;###autoload |
| 149 | (defun set-nested-alist (keyseq entry alist &optional len branches) | 149 | (defun set-nested-alist (keyseq entry alist &optional len branches) |
| 150 | "Set ENTRY for KEYSEQ in a nested alist ALIST. | 150 | "Set ENTRY for KEYSEQ in a nested alist ALIST. |
| 151 | Optional 4th arg LEN non-nil means the firlst LEN elements in KEYSEQ | 151 | Optional 4th arg LEN non-nil means the first LEN elements in KEYSEQ |
| 152 | is considered. | 152 | is considered. |
| 153 | Optional argument BRANCHES if non-nil is branches for a keyseq | 153 | Optional argument BRANCHES if non-nil is branches for a keyseq |
| 154 | longer than KEYSEQ. | 154 | longer than KEYSEQ. |
| 155 | See the documentation of `nested-alist-p' for more detail." | 155 | See the documentation of `nested-alist-p' for more detail." |
| 156 | (or (nested-alist-p alist) | 156 | (or (nested-alist-p alist) |
| 157 | (error "Invalid arguement %s" alist)) | 157 | (error "Invalid argument %s" alist)) |
| 158 | (let ((islist (listp keyseq)) | 158 | (let ((islist (listp keyseq)) |
| 159 | (len (or len (length keyseq))) | 159 | (len (or len (length keyseq))) |
| 160 | (i 0) | 160 | (i 0) |
| @@ -189,7 +189,7 @@ If ALIST is not deep enough for KEYSEQ, return number which is | |||
| 189 | Optional 3rd argument NIL-FOR-TOO-LONG non-nil means return nil | 189 | Optional 3rd argument NIL-FOR-TOO-LONG non-nil means return nil |
| 190 | even if ALIST is not deep enough." | 190 | even if ALIST is not deep enough." |
| 191 | (or (nested-alist-p alist) | 191 | (or (nested-alist-p alist) |
| 192 | (error "invalid arguement %s" alist)) | 192 | (error "invalid argument %s" alist)) |
| 193 | (or len | 193 | (or len |
| 194 | (setq len (length keyseq))) | 194 | (setq len (length keyseq))) |
| 195 | (let ((i (or start 0))) | 195 | (let ((i (or start 0))) |
| @@ -266,9 +266,9 @@ If optional arg BASE-ONLY is non-nil, only base coding systems are listed." | |||
| 266 | (let* ((coding (car (cdr tail))) | 266 | (let* ((coding (car (cdr tail))) |
| 267 | (aliases (coding-system-get coding 'alias-coding-systems))) | 267 | (aliases (coding-system-get coding 'alias-coding-systems))) |
| 268 | (if (or | 268 | (if (or |
| 269 | ;; CODING is an eol varinant if not in ALIASES. | 269 | ;; CODING is an eol variant if not in ALIASES. |
| 270 | (not (memq coding aliases)) | 270 | (not (memq coding aliases)) |
| 271 | ;; CODING is an alias if it is not car of ALISES. | 271 | ;; CODING is an alias if it is not car of ALIASES. |
| 272 | (and base-only (not (eq coding (car aliases))))) | 272 | (and base-only (not (eq coding (car aliases))))) |
| 273 | (setcdr tail (cdr (cdr tail))) | 273 | (setcdr tail (cdr (cdr tail))) |
| 274 | (setq tail (cdr tail))))) | 274 | (setq tail (cdr tail))))) |
| @@ -347,7 +347,7 @@ coding systems ordered by priority." | |||
| 347 | ;;;###autoload | 347 | ;;;###autoload |
| 348 | (defun detect-coding-with-language-environment (from to lang-env) | 348 | (defun detect-coding-with-language-environment (from to lang-env) |
| 349 | "Detect a coding system of the text between FROM and TO with LANG-ENV. | 349 | "Detect a coding system of the text between FROM and TO with LANG-ENV. |
| 350 | The detection takes into accont the coding system priorities for the | 350 | The detection takes into account the coding system priorities for the |
| 351 | language environment LANG-ENV." | 351 | language environment LANG-ENV." |
| 352 | (let ((coding-priority (get-language-info lang-env 'coding-priority))) | 352 | (let ((coding-priority (get-language-info lang-env 'coding-priority))) |
| 353 | (if coding-priority | 353 | (if coding-priority |
| @@ -359,7 +359,7 @@ language environment LANG-ENV." | |||
| 359 | (detect-coding-region from to)))) | 359 | (detect-coding-region from to)))) |
| 360 | 360 | ||
| 361 | 361 | ||
| 362 | ;;; Composite charcater manipulations. | 362 | ;;; Composite character manipulations. |
| 363 | 363 | ||
| 364 | ;;;###autoload | 364 | ;;;###autoload |
| 365 | (defun compose-region (start end) | 365 | (defun compose-region (start end) |
| @@ -483,7 +483,7 @@ overall glyph is updated as follows: | |||
| 483 | ;;;###autoload | 483 | ;;;###autoload |
| 484 | (defun compose-chars (first-component &rest args) | 484 | (defun compose-chars (first-component &rest args) |
| 485 | "Return one char string composed from the arguments. | 485 | "Return one char string composed from the arguments. |
| 486 | Each argument is a character (including a composite chararacter) | 486 | Each argument is a character (including a composite character) |
| 487 | or a composition rule. | 487 | or a composition rule. |
| 488 | A composition rule has the form \(GLOBAL-REF-POINT . NEW-REF-POINT). | 488 | A composition rule has the form \(GLOBAL-REF-POINT . NEW-REF-POINT). |
| 489 | See the documentation of `reference-point-alist' for more detail." | 489 | See the documentation of `reference-point-alist' for more detail." |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 03de406c3f3..df0cb79fa1c 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -235,7 +235,7 @@ See the function `charset-info' for more detail." | |||
| 235 | `(aref (charset-info ,charset) 14))) | 235 | `(aref (charset-info ,charset) 14))) |
| 236 | 236 | ||
| 237 | (defun set-charset-plist (charset plist) | 237 | (defun set-charset-plist (charset plist) |
| 238 | "Set CHARSET's property list to PLIST, and retrun PLIST." | 238 | "Set CHARSET's property list to PLIST, and return PLIST." |
| 239 | (aset (charset-info charset) 14 plist)) | 239 | (aset (charset-info charset) 14 plist)) |
| 240 | 240 | ||
| 241 | (defun make-char (charset &optional c1 c2) | 241 | (defun make-char (charset &optional c1 c2) |
| @@ -355,7 +355,7 @@ See also the documentation of make-char." | |||
| 355 | ;; The value is a list to indicate valid byte ranges of the encoded | 355 | ;; The value is a list to indicate valid byte ranges of the encoded |
| 356 | ;; file. Each element of the list is an integer or a cons of integer. | 356 | ;; file. Each element of the list is an integer or a cons of integer. |
| 357 | ;; In the former case, the integer value is a valid byte code. In the | 357 | ;; In the former case, the integer value is a valid byte code. In the |
| 358 | ;; latter case, the integers specifies the range of valie byte codes. | 358 | ;; latter case, the integers specifies the range of valid byte codes. |
| 359 | 359 | ||
| 360 | 360 | ||
| 361 | ;; Return coding-spec of CODING-SYSTEM | 361 | ;; Return coding-spec of CODING-SYSTEM |
| @@ -535,7 +535,7 @@ a value of `safe-charsets' in PLIST." | |||
| 535 | (if (or (not (integerp type)) (< type 0) (> type 5)) | 535 | (if (or (not (integerp type)) (< type 0) (> type 5)) |
| 536 | (error "TYPE argument must be 0..5")) | 536 | (error "TYPE argument must be 0..5")) |
| 537 | (if (or (not (integerp mnemonic)) (<= mnemonic ? ) (> mnemonic 127)) | 537 | (if (or (not (integerp mnemonic)) (<= mnemonic ? ) (> mnemonic 127)) |
| 538 | (error "MNEMONIC arguemnt must be an ASCII printable character.")) | 538 | (error "MNEMONIC argument must be an ASCII printable character.")) |
| 539 | (aset coding-spec coding-spec-type-idx type) | 539 | (aset coding-spec coding-spec-type-idx type) |
| 540 | (aset coding-spec coding-spec-mnemonic-idx mnemonic) | 540 | (aset coding-spec coding-spec-mnemonic-idx mnemonic) |
| 541 | (aset coding-spec coding-spec-doc-string-idx | 541 | (aset coding-spec coding-spec-doc-string-idx |
| @@ -763,7 +763,7 @@ the text is encoded or decoded by CODING-SYSTEM." | |||
| 763 | (check-coding-system coding-system) | 763 | (check-coding-system coding-system) |
| 764 | (setq selection-coding-system coding-system)) | 764 | (setq selection-coding-system coding-system)) |
| 765 | 765 | ||
| 766 | ;; Coding system lastly specfied by the command | 766 | ;; Coding system lastly specified by the command |
| 767 | ;; set-next-selection-coding-system. | 767 | ;; set-next-selection-coding-system. |
| 768 | (defvar last-next-selection-coding-system nil) | 768 | (defvar last-next-selection-coding-system nil) |
| 769 | 769 | ||
| @@ -789,7 +789,7 @@ This setting is effective for the next communication only." | |||
| 789 | LIST is a list of coding categories ordered by priority." | 789 | LIST is a list of coding categories ordered by priority." |
| 790 | (let ((l arg) | 790 | (let ((l arg) |
| 791 | (current-list (copy-sequence coding-category-list))) | 791 | (current-list (copy-sequence coding-category-list))) |
| 792 | ;; Check the varidity of ARG while deleting coding categories in | 792 | ;; Check the validity of ARG while deleting coding categories in |
| 793 | ;; ARG from CURRENT-LIST. We assume that CODING-CATEGORY-LIST | 793 | ;; ARG from CURRENT-LIST. We assume that CODING-CATEGORY-LIST |
| 794 | ;; contains all coding categories. | 794 | ;; contains all coding categories. |
| 795 | (while l | 795 | (while l |
| @@ -827,7 +827,7 @@ and the last 3k of the file, but the middle may be omitted. | |||
| 827 | It checks FILENAME against the variable `auto-coding-alist'. | 827 | It checks FILENAME against the variable `auto-coding-alist'. |
| 828 | If FILENAME doesn't match any entries in the variable, | 828 | If FILENAME doesn't match any entries in the variable, |
| 829 | it checks for a `coding:' tag in the first one or two lines following | 829 | it checks for a `coding:' tag in the first one or two lines following |
| 830 | point. If no `coding:' tag is found, it checks for alocal variables | 830 | point. If no `coding:' tag is found, it checks for local variables |
| 831 | list in the last 3K bytes out of the SIZE bytes. | 831 | list in the last 3K bytes out of the SIZE bytes. |
| 832 | 832 | ||
| 833 | The return value is the specified coding system, | 833 | The return value is the specified coding system, |
| @@ -851,7 +851,7 @@ function by default." | |||
| 851 | (tail-end (+ head-start size)) | 851 | (tail-end (+ head-start size)) |
| 852 | coding-system head-found tail-found pos) | 852 | coding-system head-found tail-found pos) |
| 853 | ;; Try a short cut by searching for the string "coding:" | 853 | ;; Try a short cut by searching for the string "coding:" |
| 854 | ;; and for "unibyte:" at th ehead and tail of SIZE bytes. | 854 | ;; and for "unibyte:" at the head and tail of SIZE bytes. |
| 855 | (setq head-found (or (search-forward "coding:" head-end t) | 855 | (setq head-found (or (search-forward "coding:" head-end t) |
| 856 | (search-forward "unibyte:" head-end t))) | 856 | (search-forward "unibyte:" head-end t))) |
| 857 | (if (and head-found (> head-found tail-start)) | 857 | (if (and head-found (> head-found tail-start)) |
| @@ -1018,7 +1018,7 @@ There are three of such tables, `file-coding-system-alist', | |||
| 1018 | TARGET-TYPE specifies which of them to modify. | 1018 | TARGET-TYPE specifies which of them to modify. |
| 1019 | If it is `file', it affects `file-coding-system-alist' (which see). | 1019 | If it is `file', it affects `file-coding-system-alist' (which see). |
| 1020 | If it is `process', it affects `process-coding-system-alist' (which see). | 1020 | If it is `process', it affects `process-coding-system-alist' (which see). |
| 1021 | If it is `network', it affects `network-codign-system-alist' (which see). | 1021 | If it is `network', it affects `network-coding-system-alist' (which see). |
| 1022 | 1022 | ||
| 1023 | REGEXP is a regular expression matching a target of I/O operation. | 1023 | REGEXP is a regular expression matching a target of I/O operation. |
| 1024 | The target is a file name if TARGET-TYPE is `file', a program name if | 1024 | The target is a file name if TARGET-TYPE is `file', a program name if |
| @@ -1158,7 +1158,7 @@ See also the variable `nonascii-translation-table'." | |||
| 1158 | table)) | 1158 | table)) |
| 1159 | 1159 | ||
| 1160 | (defun define-translation-table (symbol &rest args) | 1160 | (defun define-translation-table (symbol &rest args) |
| 1161 | "Define SYMBOL as a name of translation table makde by ARGS. | 1161 | "Define SYMBOL as a name of translation table made by ARGS. |
| 1162 | 1162 | ||
| 1163 | See the documentation of the function `make-translation-table' for the | 1163 | See the documentation of the function `make-translation-table' for the |
| 1164 | meaning of ARGS. | 1164 | meaning of ARGS. |