diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
| commit | 2aa6b47e3e216410195cf7ec3abb5902f38082fa (patch) | |
| tree | 1b993c346dd4b6e92df488e1228411a6c737fef0 /lisp/subr.el | |
| parent | 5bc3263303bde93db32b0799ecee0cfa9fe40e9a (diff) | |
| parent | 6e3adf8a4a796cea4328a528da48fc972b3feed6 (diff) | |
| download | emacs-2aa6b47e3e216410195cf7ec3abb5902f38082fa.tar.gz | |
Merge from origin/emacs-25
6e3adf8 Fix crash in syntax.c after GC
973ce5a Improve squiggly heredoc support in non-SMIE Ruby mode
9d5cceb Fix doc string quoting
0b33a23 Fix mouse dragging of vertical dividers with scroll bars on l...
a5d05f4 * etc/PROBLEMS: Mention the link-time problems on FreeBSD 11.
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index b66ff288b7a..358bfa5e1c0 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3954,9 +3954,9 @@ the match data are the result of matching REGEXP against a substring of STRING, the same substring that is the actual text of the match which is passed to REP as its argument. -To replace only the first match (if any), make REGEXP match up to \\' +To replace only the first match (if any), make REGEXP match up to \\\\=' and replace a sub-expression, e.g. - (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\'\" \"bar\" \" foo foo\" nil nil 1) + (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\\\='\" \"bar\" \" foo foo\" nil nil 1) => \" bar foo\"" ;; To avoid excessive consing from multiple matches in long strings, |