Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org
commit41e962982dfe424c69ed99f0bd26a6e4eb67107f
authorGlenn Morris <rgm@gnu.org>
Mon, 3 Nov 2014 21:49:37 +0000 (3 16:49 -0500)
committerGlenn Morris <rgm@gnu.org>
Mon, 3 Nov 2014 21:49:37 +0000 (3 16:49 -0500)
treed7cda64bfecc7b9403459fda89b7f39a9fd8732f
parent303fd9411f21d19604306ecdbd89941bf4923201
parentbd673cc594764572cd49bd0f10a0432006368489
Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org
doc/emacs/ChangeLog
doc/emacs/programs.texi
etc/NEWS.24
lisp/ChangeLog
src/ChangeLog
src/nsfns.m
src/window.c
src/xdisp.c