diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2014-12-12 19:15:10 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2014-12-12 19:23:19 -0500 |
| commit | 28e0d0c95d8e17e18e94744e99ccd68c8c911703 (patch) | |
| tree | a45021bd7042b2008cf6084bd4019777b7575492 /doc | |
| parent | b81a1837916a7f3f7abd953338302fa237a532f2 (diff) | |
| download | emacs-28e0d0c95d8e17e18e94744e99ccd68c8c911703.tar.gz | |
Merge from origin/emacs-24
bd6c441 * simple.el (password-word-equivalents): Add "passcode", used for numeric secrets like PINs or RSA tokens.
16d4c1c A better fix for bug#19346
82ec808 * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files.
3cf7629 Git ignore lib/std*.h
301a401 Always define `gnutls-available-p' even if GnuTLS is not available.
d76b9b2 Don't break example string between 2 lines (bug#19257)
75b4857 Port commit-msg to mawk
9ac0332 Improve commit-msg messages and autosquash
0c2f254 Support overflow-newline-into-fringe together with word-wrap (bug#19300)
935ee05 * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in order to determine `tramp-own-remote-path'.
c2db939 python.el: Support interpreter paths with spaces
d83f329 ChangeLog fix
0f9fbb9 Port commit-message checking to FreeBSD 9.
3db1ada admin/MAINTAINERS: Update my interests and responsibilities.
6382f24 * .gitignore: Ignore autosave files.
Conflicts:
ChangeLog
lisp/progmodes/python.el
src/gnutls.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/text.texi | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index e7b5606b681..ad94751a790 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2014-12-11 Eli Zaretskii <eliz@gnu.org> + + * text.texi (Comparing Text): Prevent a text string from being + broken between 2 lines. (Bug#19257) + 2014-12-09 Lars Magne Ingebrigtsen <larsi@gnus.org> * files.texi (Contents of Directories): Document diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 720343cb17d..3ef565b8f30 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -349,10 +349,10 @@ This function ignores case when comparing characters if @code{case-fold-search} is non-@code{nil}. 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 @w{@samp{foobarbar 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) |