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.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index af9ad5ccfe159f375ee0ad8d8083006d7c9b188e..e4bc6eb5bcc40b1fe1aecb1b024147ee9cebc863 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+       * nonascii.texi (Text Representations): Document that
+       multibyte-string-p returns nil for non-string objects.
+
 2013-07-06  Glenn Morris  <rgm@gnu.org>
 
        * elisp.texi (Top): Move WWW_GNU_ORG section outside @copying.

diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index e462c3b4ce40624d62874af31c62131ef4ab9160..b8b62325bb4e519e12fff20a6ad1371823fc3e44 100644 (file)
--- 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 0465bdcaf2e2728201f85c0b8a244406313235c8..83d66ee6de63caac15c258193fd4117207a1f6eb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+       * data.c (Fmultibyte_string_p): Doc fix.
+
 2013-07-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use emacs_open more consistently when opening files.

diff --git a/src/data.c b/src/data.c
index 955c39727bbbd5329fb1dddb274d5d4a26c5ba73..dedbd51f36e19c54959afa17255fa12135ed5b1e 100644 (file)
--- 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))