Merge from emacs-24; up to 2014-07-22T06:37:31Z!yamaoka@jpl.org
commit32ade3f01a0185f2a836c313d9d50564abe4e254
authorGlenn Morris <rgm@gnu.org>
Thu, 9 Oct 2014 04:23:09 +0000 (8 21:23 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 9 Oct 2014 04:23:09 +0000 (8 21:23 -0700)
tree195ed03adf2f7757d67caf79dd2baff44911748c
parentfdcb06012a36a8ec800e33554ae94c26e43a7c05
parent942a57a2a5c56575a15dd22e1feebd1825f281b0
Merge from emacs-24; up to 2014-07-22T06:37:31Z!yamaoka@jpl.org
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/frames.texi
lisp/ChangeLog
lisp/faces.el
lisp/frame.el
lisp/term.el
src/w32term.c