master updated (6d1d048 -> 194d54a)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  6d1d048   Revert "Make the `i' command in Info-mode remove 
duplicate matches"
       new  9136c06   Add a new `server-edit-abort' command
       new  194d54a   Fix placement of point in Dired deletion operations


Summary of changes:
 doc/emacs/misc.texi |  6 ++++++
 etc/NEWS            |  6 ++++++
 lisp/dired.el       | 35 ++++++++++++++++++++---------------
 lisp/server.el      | 15 ++++++++++++++-
 4 files changed, 46 insertions(+), 16 deletions(-)