Merge from emacs-24; up to r117323
commit35a13be910fe3284b2af9ef21b986e74b00cf76b
authorGlenn Morris <rgm@gnu.org>
Sat, 28 Jun 2014 17:27:29 +0000 (28 10:27 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 28 Jun 2014 17:27:29 +0000 (28 10:27 -0700)
treef26f6ae819d12ba970371b60d39412c3f02a13f9
parent7979e7decc1b5a47a9598c7f8f42b8d1f34deffd
parent7060e90406c28883c58514ca427b0beecaa6c102
Merge from emacs-24; up to r117323
doc/lispref/ChangeLog
doc/lispref/minibuf.texi
etc/ChangeLog
lisp/ChangeLog
lisp/subr.el
src/ChangeLog
src/coding.c
test/ChangeLog