master updated (6a5f970 -> 14fb657b)

[Paul Eggert]

eggert pushed a change to branch master.

      from  6a5f970   Sync latest SKK-JISYO.L
       new  dfeb059   * lisp/files.el (insert-directory): Simplify (if ... X X) 
to X.
       new  ff864be   Fix PWD startup checking with symlinks
       new  14fb657b  Fix expand-file-name symlink-to-dir bug


Summary of changes:
 doc/lispref/files.texi       | 16 ++++++++++++++--
 etc/NEWS                     |  6 ++++++
 lisp/files.el                | 11 +++--------
 lisp/startup.el              |  9 +++------
 src/fileio.c                 | 37 ++++++++++++++++++++++---------------
 test/lisp/net/tramp-tests.el | 11 ++++-------
 test/src/fileio-tests.el     | 11 +++++++++++
 7 files changed, 63 insertions(+), 38 deletions(-)