diff options
| author | Eli Zaretskii <[email protected]> | 2013-07-06 11:05:21 +0300 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2013-07-06 11:05:21 +0300 |
| commit | 3323c263c78e74385bc03d5270cdd44399b0a8d1 (patch) | |
| tree | 36ee54f1f8fc6942a68bfaa59dc8c40f6be6f84b | |
| parent | 406af475be236b874e3633b68999f6a099d47587 (diff) | |
Clarify documentation of multibyte-string-p.
src/data.c (Fmultibyte_string_p): Doc fix.
doc/lispref/nonascii.texi (Text Representations): Document that
multibyte-string-p returns nil for non-string objects.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/nonascii.texi | 3 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/data.c | 3 |
4 files changed, 13 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index af9ad5ccfe..e4bc6eb5bc 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2013-07-06 Eli Zaretskii <[email protected]> + + * nonascii.texi (Text Representations): Document that + multibyte-string-p returns nil for non-string objects. + 2013-07-06 Glenn Morris <[email protected]> * elisp.texi (Top): Move WWW_GNU_ORG section outside @copying. diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index e462c3b4ce..b8b62325bb 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -124,7 +124,8 @@ belong to the same character. @defun multibyte-string-p string Return @code{t} if @var{string} is a multibyte string, @code{nil} -otherwise. +otherwise. This function also returns @code{nil} if @var{string} is +some object other than a string. @end defun @defun string-bytes string diff --git a/src/ChangeLog b/src/ChangeLog index 0465bdcaf2..83d66ee6de 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-07-06 Eli Zaretskii <[email protected]> + + * data.c (Fmultibyte_string_p): Doc fix. + 2013-07-05 Paul Eggert <[email protected]> Use emacs_open more consistently when opening files. diff --git a/src/data.c b/src/data.c index 955c39727b..dedbd51f36 100644 --- a/src/data.c +++ b/src/data.c @@ -377,7 +377,8 @@ DEFUN ("stringp", Fstringp, Sstringp, 1, 1, 0, DEFUN ("multibyte-string-p", Fmultibyte_string_p, Smultibyte_string_p, 1, 1, 0, - doc: /* Return t if OBJECT is a multibyte string. */) + doc: /* Return t if OBJECT is a multibyte string. +Return nil if OBJECT is either a unibyte string, or not a string. */) (Lisp_Object object) { if (STRINGP (object) && STRING_MULTIBYTE (object)) |