[Emacs-diffs] emacs-25 updated (6f5f62b -> ae18cc2)

[Phillip Lord]

phillord pushed a change to branch emacs-25.

      from  6f5f62b   Fix compiler warnings in w32.c
       new  7592cb9   After delete, record point location in undo.
       new  13a03c9   Fix regression after merge.
       new  ae18cc2   Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs 
into emacs-25


Summary of changes:
 lisp/simple.el                |    9 +++---
 src/keyboard.c                |    7 ++++-
 src/keyboard.h                |   13 +++++++++
 src/undo.c                    |   55 +++++++++++++++++++++++------------------
 test/automated/simple-test.el |   48 +++++++++++++++++++++++++++++++++++
 5 files changed, 103 insertions(+), 29 deletions(-)