Merge from emacs-24; up to 2014-04-16T15:28:06Z!eggert@cs.ucla.edu
authorJuanma Barranquero <lekktu@gmail.com>
Fri, 18 Apr 2014 23:36:51 +0000 (01:36 +0200)
committerJuanma Barranquero <lekktu@gmail.com>
Fri, 18 Apr 2014 23:36:51 +0000 (01:36 +0200)
commitbba633792b813249a47dde828cbf84cdb946ba60
treee320e5217ad3dc878e49fb86be7297a5cef60e5f
parentf0496348d1b9b1f2fff9e4265f51cbdc77eb40dc
parent2a2e6726d1f7031d89fd6740e5b167476267f778
Merge from emacs-24; up to 2014-04-16T15:28:06Z!eggert@cs.ucla.edu
admin/ChangeLog
lisp/ChangeLog
src/ChangeLog
src/emacs.c
src/insdel.c
src/xdisp.c
src/xterm.c
test/ChangeLog