Merge from emacs-24; up to 2014-04-25T10:35:01Z!michael.albinus@gmx.de

2 files changed, 10 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e9ea1f7459e..04b2e91ee4b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * strings.texi (Text Comparison): Mention
+        equal-including-properties for when text properties of the strings
+        matter for comparison.
+
 2014-04-22  Eli Zaretskii  <eliz@gnu.org>
 
         * text.texi (Registers): Document register-read-with-preview.
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 24218a9cf15..e6b00f06f79 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -423,8 +423,10 @@ the symbol names are used.  Case is always significant, regardless of
 
 This function is equivalent to @code{equal} for comparing two strings
 (@pxref{Equality Predicates}).  In particular, the text properties of
-the two strings are ignored.  But if either argument is not a string
-or symbol, an error is signaled.
+the two strings are ignored; use @code{equal-including-properties} if
+you need to distinguish between strings that differ only in their text
+properties.  However, unlike @code{equal}, if either argument is not a
+string or symbol, @code{string=} signals an error.
 
 @example
 (string= "abc" "abc")