master updated (9ac6ff5 -> 86a795f)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  9ac6ff5   Make the test for auto-mode-alist from .dir-local.el 
stricter
       new  5431a58   Add new function `directory-append'
       new  86a795f   Fix problem when moving files called ~ to the trash


Summary of changes:
 doc/lispref/files.texi      | 50 ++++++++++-----------------------------------
 etc/NEWS                    |  4 ++++
 lisp/emacs-lisp/shortdoc.el |  9 +++++++-
 lisp/files.el               | 16 +++++++--------
 src/fileio.c                | 46 +++++++++++++++++++++++++++++++++++++++++
 test/src/fileio-tests.el    |  8 ++++++++
 6 files changed, 85 insertions(+), 48 deletions(-)