Merge from trunk.

diff --cc etc/NEWS
Simple merge

diff --cc nt/inc/ms-w32.h
Simple merge

diff --cc src/emacs.c
index 22be1d8,159b0d5..af69e2c
--- 1/src/emacs.c
--- 2/src/emacs.c
+++ b/src/emacs.c
@@@ -2202,17 -2175,14 +2206,20 @@@ decode_env_path (const char *evarname, 
  {
    const char *path, *p;
    Lisp_Object lpath, element, tem;
+   /* Default is to use "." for empty path elements.
+      But if argument EMPTY is true, use nil instead.  */
+   Lisp_Object empty_element = empty ? Qnil : build_string (".");
  #ifdef WINDOWSNT
    bool defaulted = 0;
 -  const char *emacs_dir = egetenv ("emacs_dir");
    static const char *emacs_dir_env = "%emacs_dir%/";
    const size_t emacs_dir_len = strlen (emacs_dir_env);
 +  const char *edir = egetenv ("emacs_dir");
 +  char emacs_dir[MAX_UTF8_PATH];
 +
 +  /* egetenv looks in process-environment, which holds the variables
 +     in their original system-locale encoding.  We need emacs_dir to
 +     be in UTF-8.  */
 +  filename_from_ansi (edir, emacs_dir);
  #endif
  
    /* It's okay to use getenv here, because this function is only used

diff --cc src/fileio.c
Simple merge

diff --cc src/gnutls.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32proc.c
Simple merge

diff --cc src/w32term.c
Simple merge