aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-12-11 20:27:00 +0200
committerEli Zaretskii2014-12-11 20:27:00 +0200
commitd76b9b2a213fa4e2c812a2c2503b4bfa4c28ece8 (patch)
tree613de89dbc7622841620a6d7f69a830e5f8629c1
parent75b4857ef040863b4d53ea2a27993fdd8370f7af (diff)
downloademacs-d76b9b2a213fa4e2c812a2c2503b4bfa4c28ece8.tar.gz
emacs-d76b9b2a213fa4e2c812a2c2503b4bfa4c28ece8.zip
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{}.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/text.texi8
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9f8461c154a..dcab3bac6ed 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12014-12-11 Eli Zaretskii <eliz@gnu.org>
2
3 * text.texi (Comparing Text): Prevent a text string from being
4 broken between 2 lines. (Bug#19257)
5
12014-11-19 Paul Eggert <eggert@cs.ucla.edu> 62014-11-19 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Lessen focus on ChangeLog files, as opposed to change log entries. 8 Lessen focus on ChangeLog files, as opposed to change log entries.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 6665cc3e673..09dec5671f9 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -343,10 +343,10 @@ This function ignores case when comparing characters
343if @code{case-fold-search} is non-@code{nil}. It always ignores 343if @code{case-fold-search} is non-@code{nil}. It always ignores
344text properties. 344text properties.
345 345
346Suppose the current buffer contains the text @samp{foobarbar 346Suppose you have the text @w{@samp{foobarbar haha!rara!}} in the
347haha!rara!}; then in this example the two substrings are @samp{rbar } 347current buffer; then in this example the two substrings are @samp{rbar
348and @samp{rara!}. The value is 2 because the first substring is greater 348} and @samp{rara!}. The value is 2 because the first substring is
349at the second character. 349greater at the second character.
350 350
351@example 351@example
352(compare-buffer-substrings nil 6 11 nil 16 21) 352(compare-buffer-substrings nil 6 11 nil 16 21)