Merge from origin/emacs-25
commitf8eecb1c6c8a3646d65112843c7f813fe639d57f
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2016 19:50:31 +0000 (25 12:50 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2016 19:50:31 +0000 (25 12:50 -0700)
treea8973cca6836e72ed2d0e36ba5242c02ff220fdf
parent43645b4dc4eb4611127dc8931a723e872824ecaf
parent96ac0c3ebce825e60595794f99e703ec8302e240
Merge from origin/emacs-25

96ac0c3 Yet another fix for using pointers into buffer text
1047496 Another fix for using pointer to buffer text
3121992 Fix Bug#24478
lisp/net/tramp-sh.el
src/search.c