Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Apr 2014 19:43:46 +0000 (12:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Apr 2014 19:43:46 +0000 (12:43 -0700)
commit290d7ac277986bd118e594a8100b3f40e4492cb1
treed63a3aa61cac577dd119665edaffe2def8d194e2
parent37eccff4f72c5a36dcd4b89d417b0047aab84e50
parentb262bde327db2cd9b2f01f2d3ed946d0b188cb9d
Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca
25 files changed:
ChangeLog
configure.ac
doc/emacs/ChangeLog
etc/NEWS
lib-src/ChangeLog
lisp/ChangeLog
lisp/simple.el
msdos/sed2v2.inp
src/ChangeLog
src/alloc.c
src/buffer.c
src/callproc.c
src/conf_post.h
src/data.c
src/dired.c
src/emacs.c
src/insdel.c
src/keyboard.c
src/lisp.h
src/msdos.c
src/process.c
src/sysdep.c
src/term.c
src/unexcoff.c
src/w32term.c