[Emacs-diffs] emacs-24 d76b9b2: Don't break example string between 2 lines (bug#19257)

[Eli Zaretskii]

branch: emacs-24
commit d76b9b2a213fa4e2c812a2c2503b4bfa4c28ece8
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Don't break example string between 2 lines (bug#19257)
    
     doc/lispref/text.texi (Comparing Text): Prevent a text string from being
     broken between 2 lines by using @w{}.
---
 doc/lispref/ChangeLog |    5 +++++
 doc/lispref/text.texi |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9f8461c..dcab3ba 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-11  Eli Zaretskii  <address@hidden>
+
+       * text.texi (Comparing Text): Prevent a text string from being
+       broken between 2 lines.  (Bug#19257)
+
 2014-11-19  Paul Eggert  <address@hidden>
 
        Lessen focus on ChangeLog files, as opposed to change log entries.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 6665cc3..09dec56 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -343,10 +343,10 @@ This function ignores case when comparing characters
 if @code{case-fold-search} is address@hidden  It always ignores
 text properties.
 
-Suppose the current buffer contains the text @samp{foobarbar
-haha!rara!}; then in this example the two substrings are @samp{rbar }
-and @samp{rara!}.  The value is 2 because the first substring is greater
-at the second character.
+Suppose you have the text @address@hidden haha!rara!}} in the
+current buffer; then in this example the two substrings are @samp{rbar
+} and @samp{rara!}.  The value is 2 because the first substring is
+greater at the second character.
 
 @example
 (compare-buffer-substrings nil 6 11 nil 16 21)