aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2006-11-06 23:05:34 +0000
committerJuanma Barranquero2006-11-06 23:05:34 +0000
commit5dd1c041c7fdb876b52bf33f41e8aeb119282cef (patch)
tree2c4b410406fb52b09883046608419e1f2e143721
parentc8c9333c69c41cb5605d32d86ef6fa24a8b7afc5 (diff)
downloademacs-5dd1c041c7fdb876b52bf33f41e8aeb119282cef.tar.gz
emacs-5dd1c041c7fdb876b52bf33f41e8aeb119282cef.zip
(make-char): Fix typo in docstring.
(load-with-code-conversion, charsetp): Doc fixes.
-rw-r--r--lisp/international/mule.el15
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index cea1a917be5..fe01f0b7e9c 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -38,10 +38,10 @@ Distribution date of this version of MULE (multilingual environment).")
38(defun load-with-code-conversion (fullname file &optional noerror nomessage) 38(defun load-with-code-conversion (fullname file &optional noerror nomessage)
39 "Execute a file of Lisp code named FILE whose absolute name is FULLNAME. 39 "Execute a file of Lisp code named FILE whose absolute name is FULLNAME.
40The file contents are decoded before evaluation if necessary. 40The file contents are decoded before evaluation if necessary.
41If optional second arg NOERROR is non-nil, 41If optional third arg NOERROR is non-nil,
42 report no error if FILE doesn't exist. 42 report no error if FILE doesn't exist.
43Print messages at start and end of loading unless 43Print messages at start and end of loading unless
44 optional third arg NOMESSAGE is non-nil. 44 optional fourth arg NOMESSAGE is non-nil.
45Return t if file exists." 45Return t if file exists."
46 (if (null (file-readable-p fullname)) 46 (if (null (file-readable-p fullname))
47 (and (null noerror) 47 (and (null noerror)
@@ -100,7 +100,7 @@ Return t if file exists."
100 (kill-buffer buffer))) 100 (kill-buffer buffer)))
101 (unless purify-flag 101 (unless purify-flag
102 (do-after-load-evaluation fullname)) 102 (do-after-load-evaluation fullname))
103 103
104 (unless (or nomessage noninteractive) 104 (unless (or nomessage noninteractive)
105 (if source 105 (if source
106 (message "Loading %s (source)...done" file) 106 (message "Loading %s (source)...done" file)
@@ -118,7 +118,7 @@ Return t if file exists."
118 (< (aref vector 0) 160))))) 118 (< (aref vector 0) 160)))))
119 119
120(defsubst charsetp (object) 120(defsubst charsetp (object)
121 "T if OBJECT is a charset." 121 "Return t if OBJECT is a charset."
122 (and (symbolp object) (vectorp (get object 'charset)))) 122 (and (symbolp object) (vectorp (get object 'charset))))
123 123
124(defsubst charset-info (charset) 124(defsubst charset-info (charset)
@@ -268,7 +268,7 @@ See the function `charset-info' for more detail."
268CODE1 and CODE2 are optional, but if you don't supply 268CODE1 and CODE2 are optional, but if you don't supply
269sufficient position codes, return a generic character which stands for 269sufficient position codes, return a generic character which stands for
270all characters or group of characters in the character set. 270all characters or group of characters in the character set.
271A generic character can be used to index a char table (e.g. syntax-table). 271A generic character can be used to index a char table (e.g. `syntax-table').
272 272
273Such character sets as ascii, eight-bit-control, and eight-bit-graphic 273Such character sets as ascii, eight-bit-control, and eight-bit-graphic
274don't have corresponding generic characters. If CHARSET is one of 274don't have corresponding generic characters. If CHARSET is one of
@@ -1676,8 +1676,7 @@ cons (CODING . SOURCE), where CODING is the specified coding
1676system and SOURCE is a symbol `auto-coding-alist', 1676system and SOURCE is a symbol `auto-coding-alist',
1677`auto-coding-regexp-alist', `coding:', or `auto-coding-functions' 1677`auto-coding-regexp-alist', `coding:', or `auto-coding-functions'
1678indicating by what CODING is specified. Note that the validity 1678indicating by what CODING is specified. Note that the validity
1679of CODING is not checked; it's callers responsibility to check 1679of CODING is not checked; it's callers responsibility to check it.
1680it.
1681 1680
1682If nothing is specified, the return value is nil." 1681If nothing is specified, the return value is nil."
1683 (or (let ((coding-system (auto-coding-alist-lookup filename))) 1682 (or (let ((coding-system (auto-coding-alist-lookup filename)))
@@ -1698,7 +1697,7 @@ If nothing is specified, the return value is nil."
1698 ;; and for "unibyte:" at the head and tail of SIZE bytes. 1697 ;; and for "unibyte:" at the head and tail of SIZE bytes.
1699 (setq head-found (or (search-forward "coding:" head-end t) 1698 (setq head-found (or (search-forward "coding:" head-end t)
1700 (search-forward "unibyte:" head-end t) 1699 (search-forward "unibyte:" head-end t)
1701 (search-forward "enable-character-translation:" 1700 (search-forward "enable-character-translation:"
1702 head-end t))) 1701 head-end t)))
1703 (if (and head-found (> head-found tail-start)) 1702 (if (and head-found (> head-found tail-start))
1704 ;; Head and tail are overlapped. 1703 ;; Head and tail are overlapped.