Merge from origin/emacs-25
commit1a86b5d6074d26d1a3a978cb52b2147b6f359694
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:07:00 +0000 (5 14:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:07:00 +0000 (5 14:07 -0700)
tree5b609435fb29b6f62766ddd51d8649013913970e
parentc5823cdae3de078e6db58df25769011ef3e52f36
parentd4c6774f40b6ae1fad091f66e8e43913bc9a2724
Merge from origin/emacs-25

d4c6774 Fix missing point information in undo
3a9d629 Avoid crashes when buffer modification hooks clobber match data
178b2f5 Note combine-and-quote-strings doesn't shell quote
dec7567 Explain when package-initialize isn't called
113d1e2 Fix escaping in sh-indent-after-continuation docstr
80e2044 ; * etc/NEWS: Improve previous change.
5bb9e6c ; * etc/NEWS: Document how to avoid horizontal scroll bars.
38f4b8e Clarify the documentation of back-references in replacements
doc/lispref/os.texi
doc/lispref/processes.texi
etc/NEWS
lisp/progmodes/sh-script.el
lisp/replace.el
lisp/subr.el
src/search.c
test/lisp/simple-tests.el