From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 6 Jul 2013 08:05:21 +0000 (+0300)
Subject: Clarify documentation of multibyte-string-p.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1914
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3323c263c78e74385bc03d5270cdd44399b0a8d1;p=emacs.git

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 af9ad5ccfe1..e4bc6eb5bcc 100644
--- 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 e462c3b4ce4..b8b62325bb4 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 0465bdcaf2e..83d66ee6de6 100644
--- 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 955c39727bb..dedbd51f36e 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))