auto upstream

30 files changed, 336 insertions, 198 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fba2817b1e..fdf12be0a1c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,48 @@
+2013-02-02  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Identify g++ template instantiation trace.  (Bug#12287)
+        (compilation-mode-hook, compilation-start-hook)
+        (compilation-window-height): Simplify docstrings.  (Bug#13379)
+
+2013-02-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mouse.el (mouse-drag-track): Always deactivate the mark before
+        running the final event's command since that command is in charge of
+        activating the mark if needed (bug#13523).
+
+2013-02-02  Juri Linkov  <juri@jurta.org>
+
+        * replace.el (perform-replace): Move let-bindings of isearch-*
+        variables deeper to the loop that searches for the next match.
+        Add bindings for `isearch-nonincremental' and `isearch-adjusted'.
+        Use `isearch-search-fun-default' instead of `isearch-search-fun'.
+        (Bug#13579)
+
+        * isearch.el (isearch-search-fun-default): Check for null
+        first element of isearch-cmds as a precaution when it's used
+        with inactive isearch.
+
+2013-02-02  Andrew W. Nosenko  <andrew.w.nosenko@gmail.com>  (tiny change)
+
+        * net/tramp.el (tramp-check-for-regexp): Avoid "Args out of range"
+        error when buffer in question is narrowed so position 1 is out of
+        visible part.
+
+2013-02-02  Glenn Morris  <rgm@gnu.org>
+
+        * textmodes/remember.el (remember-clipboard): Doc fix.
+
+2013-02-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/make-mode.el (makefile-fill-paragraph): Reset syntax-table
+        properties (bug#13179).
+
+2013-02-02  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (grep-regexp-alist): Use variable grep-match-face
+        instead of hard-coded default face `match'.  (Bug#9438)
+
 2012-02-01  Christopher Schmidt  <christopher@ch.ristopher.com>
 
         * vc/vc-arch.el (vc-arch-registered):
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index d876b65303c..e8720bc6624 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -4,7 +4,7 @@
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: Eric M. Ludlam  <zappo@gnu.org>
-;; Version: 1.1
+;; Version: 2.0
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -35,7 +35,7 @@
 
 (declare-function inversion-find-version "inversion")
 
-(defconst cedet-version "1.1"
+(defconst cedet-version "2.0"
   "Current version of CEDET.")
 
 (defconst cedet-packages
@@ -43,12 +43,12 @@
     ;;PACKAGE   MIN-VERSION      INSTALLDIR  DOCDIR
     (cedet         ,cedet-version "common"   "common"           )
     (eieio         "1.4"           nil       "eieio"       )
-    (semantic      "2.1"           nil       "semantic/doc")
-    (srecode       "1.1"           nil       "srecode"     )
-    (ede           "1.1"           nil       "ede"         )
+    (semantic      "2.2"           nil       "semantic/doc")
+    (srecode       "1.2"           nil       "srecode"     )
+    (ede           "1.2"           nil       "ede"         )
     (speedbar      "1.0.4"         nil       "speedbar"    )
-    (cogre         "1.1"           nil       "cogre"       )
-    (cedet-contrib "1.1"           "contrib" nil           )
+    (cogre         "1.2"           nil       "cogre"       )
+    (cedet-contrib "1.2"           "contrib" nil           )
     )
   "Table of CEDET packages to install.")
 
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 12b8f558d65..3867f628b93 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
-;; Version: 1.0
+;; Version: 1.2
 
 ;; This file is part of GNU Emacs.
 
@@ -60,7 +60,7 @@
 (declare-function ede-up-directory "ede/files")
 (declare-function semantic-lex-make-spp-table "semantic/lex-spp")
 
-(defconst ede-version "1.0"
+(defconst ede-version "1.2"
   "Current version of the Emacs EDE.")
 
 ;;; Code:
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index decd3b15812..edf2d0cb21a 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax tools
-;; Version: 2.1beta
+;; Version: 2.2
 
 ;; This file is part of GNU Emacs.
 
@@ -38,7 +38,7 @@
 (require 'semantic/tag)
 (require 'semantic/lex)
 
-(defvar semantic-version "2.1beta"
+(defvar semantic-version "2.2"
   "Current version of Semantic.")
 
 (declare-function inversion-test "inversion")
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 3201374bc92..2e2cb8a3f80 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: codegeneration
-;; Version: 1.0
+;; Version: 1.2
 
 ;; This file is part of GNU Emacs.
 
@@ -41,7 +41,7 @@
 (require 'mode-local)
 (load "srecode/loaddefs" nil 'nomessage)
 
-(defvar srecode-version "1.0"
+(defvar srecode-version "1.2"
   "Current version of the Semantic Recoder.")
 
 ;;; Code:
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 7a22e1222c9..626bc0f6dc6 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -4,7 +4,7 @@
 ;; Copyright (C) 1995-1996, 1998-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Version: 1.3
+;; Version: 1.4
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -46,7 +46,7 @@
 
 (eval-when-compile (require 'cl))       ;FIXME: Use cl-lib!
 
-(defvar eieio-version "1.3"
+(defvar eieio-version "1.4"
   "Current version of EIEIO.")
 
 (defun eieio-version ()
diff --git a/lisp/isearch.el b/lisp/isearch.el
index e16e3840d0d..31b1918429f 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2520,6 +2520,7 @@ Can be changed via `isearch-search-fun-function' for special needs."
       ;; the user adds and removes characters in the search string
       ;; (or when using nonincremental word isearch)
       (let ((lax (not (or isearch-nonincremental
+                          (null (car isearch-cmds))
                           (eq (length isearch-string)
                               (length (isearch--state-string
                                        (car isearch-cmds))))))))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 9c7bf6f9c36..a1aa104495a 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -880,9 +880,9 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
                      (copy-region-as-kill (mark) (point)))))
 
           ;; Otherwise, run binding of terminating up-event.
+          (deactivate-mark)
           (if do-multi-click
               (goto-char start-point)
-            (deactivate-mark)
             (unless moved-off-start
               (pop-mark)))
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 4f31e95aeff..1dee9e89676 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3413,7 +3413,9 @@ Erase echoed commands if exists."
                      0 (min tramp-echo-mark-marker-length (1- (point-max))))
                     (tramp-compat-funcall
                      'buffer-substring-no-properties
-                     1 (min (1+ tramp-echo-mark-marker-length) (point-max))))))
+                     (point-min)
+                     (min (+ (point-min) tramp-echo-mark-marker-length)
+                          (point-max))))))
       ;; No echo to be handled, now we can look for the regexp.
       ;; Sometimes, lines are much to long, and we run into a "Stack
       ;; overflow in regexp matcher".  For example, //DIRED// lines of
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 0711bc983e8..4b3fc91b0ff 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -142,7 +142,7 @@
 
 (defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]")
 ;;   Matches any character but a _, #, /, ", \, or newline.  N.B. _" starts a
-;; localisation string in gawk 3.1
+;; localization string in gawk 3.1
 (defconst c-awk-harmless-line-string*-re
   (concat "\\(" c-awk-harmless-line-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*"))
 ;;   Matches a (possibly empty) sequence of chars without unescaped /, ", \,
@@ -795,7 +795,8 @@
       (setq anchor (point))
       (search-forward-regexp c-awk-harmless-string*-here-re nil t)
       ;; We are now looking at either a " or a / or a brace/paren/semicolon.
-      ;; Do our thing on the string, regexp or divsion sign or update our state.
+      ;; Do our thing on the string, regexp or division sign or update
+      ;; our state.
       (setq anchor-state-/div
             (cond
              ((looking-at "_?\"")
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index eb73b77bf52..d2a9617e28e 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -42,24 +42,21 @@
 
 ;;;###autoload
 (defcustom compilation-mode-hook nil
-  "List of hook functions run by `compilation-mode' (see `run-mode-hooks')."
+  "List of hook functions run by `compilation-mode'."
   :type 'hook
   :group 'compilation)
 
 ;;;###autoload
 (defcustom compilation-start-hook nil
-  "List of hook functions run by `compilation-start' on the compilation process.
-\(See `run-hook-with-args').
-If you use \"omake -P\" and do not want \\[save-buffers-kill-terminal] to ask whether you want
-the compilation to be killed, you can use this hook:
-  (add-hook 'compilation-start-hook
-    (lambda (process) (set-process-query-on-exit-flag process nil)) nil t)"
+  "Hook run after starting a new compilation process.
+The hook is run with one argument, the new process."
   :type 'hook
   :group 'compilation)
 
 ;;;###autoload
 (defcustom compilation-window-height nil
-  "Number of lines in a compilation window.  If nil, use Emacs default."
+  "Number of lines in a compilation window.
+If nil, use Emacs default."
   :type '(choice (const :tag "Default" nil)
                  integer)
   :group 'compilation)
@@ -265,7 +262,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \\([0-9]+\\)\\(?:-\\(?4:[0-9]+\\)\\(?:\\.\\(?5:[0-9]+\\)\\)?\
 \\|[.:]\\(?3:[0-9]+\\)\\(?:-\\(?:\\(?4:[0-9]+\\)\\.\\)?\\(?5:[0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
- *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\
+ *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|\\[ skipping .+ \\]\\|\
+\\(?:instantiated\\|required\\) from\\|[Nn]ote\\)\\|\
  *[Ee]rror\\|[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 4) (3 . 5) (6 . 7))
 
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ef321addf24..d8c39f2ddef 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -359,7 +359,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
         (when grep-highlight-matches
           (let* ((beg (match-end 0))
                  (end (save-excursion (goto-char beg) (line-end-position)))
-                 (mbeg (text-property-any beg end 'font-lock-face 'match)))
+                 (mbeg (text-property-any beg end 'font-lock-face grep-match-face)))
             (when mbeg
               (- mbeg beg)))))
       .
@@ -367,7 +367,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
         (when grep-highlight-matches
           (let* ((beg (match-end 0))
                  (end (save-excursion (goto-char beg) (line-end-position)))
-                 (mbeg (text-property-any beg end 'font-lock-face 'match))
+                 (mbeg (text-property-any beg end 'font-lock-face grep-match-face))
                  (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end))))
             (when mend
               (- mend beg)))))))
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index be718135f99..20673866bc4 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1304,6 +1304,12 @@ Fill comments, backslashed lines, and variable definitions specially."
         (save-restriction
           (narrow-to-region beginning end)
           (makefile-backslash-region (point-min) (point-max) t)
+          ;; Backslashed newlines are marked as punctuation, so when
+          ;; fill-delete-newlines turns the LF into SPC, we end up with spaces
+          ;; which back-to-indentation (called via fill-newline ->
+          ;; fill-indent-to-left-margin -> indent-line-to) thinks are real code
+          ;; (bug#13179).
+          (remove-text-properties (point-min) (point-max) '(syntax-table))
           (let ((fill-paragraph-function nil)
                 ;; Adjust fill-column to allow space for the backslash.
                 (fill-column (- fill-column 1)))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2cb108cc316..35c5ba19e33 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2334,7 +2334,7 @@ Argument OUTPUT is a string with the output from the comint process."
               ;; encounters an exception, it prints the _entire_ stack
               ;; trace.  To handle all of these cases, we want to find
               ;; the _last_ stack frame printed in the most recent
-              ;; batch of output, then jump to the corrsponding
+              ;; batch of output, then jump to the corresponding
               ;; file/line number.
               (goto-char (point-max))
               (when (re-search-backward python-pdbtrack-stacktrace-info-regexp nil t)
diff --git a/lisp/replace.el b/lisp/replace.el
index fb251821445..7757426cf95 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1819,19 +1819,6 @@ make, or the user didn't cancel the call."
             case-fold-search))
          (nocasify (not (and case-replace case-fold-search)))
          (literal (or (not regexp-flag) (eq regexp-flag 'literal)))
-         (search-function
-          (or (if regexp-flag
-                  replace-re-search-function
-                replace-search-function)
-              (let ((isearch-regexp regexp-flag)
-                    (isearch-word delimited-flag)
-                    (isearch-lax-whitespace
-                     replace-lax-whitespace)
-                    (isearch-regexp-lax-whitespace
-                     replace-regexp-lax-whitespace)
-                    (isearch-case-fold-search case-fold-search)
-                    (isearch-forward t))
-                (isearch-search-fun))))
          (search-string from-string)
          (real-match-data nil)       ; The match data for the current match.
          (next-replacement nil)
@@ -1894,39 +1881,62 @@ make, or the user didn't cancel the call."
         ;; Loop finding occurrences that perhaps should be replaced.
         (while (and keep-going
                     (not (or (eobp) (and limit (>= (point) limit))))
-                    ;; Use the next match if it is already known;
-                    ;; otherwise, search for a match after moving forward
-                    ;; one char if progress is required.
-                    (setq real-match-data
-                          (cond ((consp match-again)
-                                 (goto-char (nth 1 match-again))
-                                 (replace-match-data
-                                  t real-match-data match-again))
-                                ;; MATCH-AGAIN non-nil means accept an
-                                ;; adjacent match.
-                                (match-again
-                                 (and
-                                  (funcall search-function search-string
-                                           limit t)
-                                  ;; For speed, use only integers and
-                                  ;; reuse the list used last time.
-                                  (replace-match-data t real-match-data)))
-                                ((and (< (1+ (point)) (point-max))
-                                      (or (null limit)
-                                          (< (1+ (point)) limit)))
-                                 ;; If not accepting adjacent matches,
-                                 ;; move one char to the right before
-                                 ;; searching again.  Undo the motion
-                                 ;; if the search fails.
-                                 (let ((opoint (point)))
-                                   (forward-char 1)
-                                   (if (funcall
-                                        search-function search-string
-                                        limit t)
-                                       (replace-match-data
-                                        t real-match-data)
-                                     (goto-char opoint)
-                                     nil))))))
+                    ;; Let-bind global isearch-* variables to values used
+                    ;; to search the next replacement.  These let-bindings
+                    ;; should be effective both at the time of calling
+                    ;; `isearch-search-fun-default' and also at the
+                    ;; time of funcalling `search-function'.
+                    ;; These isearch-* bindings can't be placed higher
+                    ;; outside of this loop because then another I-search
+                    ;; used after `recursive-edit' might override them.
+                    (let* ((isearch-regexp regexp-flag)
+                           (isearch-word delimited-flag)
+                           (isearch-lax-whitespace
+                            replace-lax-whitespace)
+                           (isearch-regexp-lax-whitespace
+                            replace-regexp-lax-whitespace)
+                           (isearch-case-fold-search case-fold-search)
+                           (isearch-adjusted nil)
+                           (isearch-nonincremental t) ; don't use lax word mode
+                           (isearch-forward t)
+                           (search-function
+                            (or (if regexp-flag
+                                    replace-re-search-function
+                                  replace-search-function)
+                                (isearch-search-fun-default))))
+                      ;; Use the next match if it is already known;
+                      ;; otherwise, search for a match after moving forward
+                      ;; one char if progress is required.
+                      (setq real-match-data
+                            (cond ((consp match-again)
+                                   (goto-char (nth 1 match-again))
+                                   (replace-match-data
+                                    t real-match-data match-again))
+                                  ;; MATCH-AGAIN non-nil means accept an
+                                  ;; adjacent match.
+                                  (match-again
+                                   (and
+                                    (funcall search-function search-string
+                                             limit t)
+                                    ;; For speed, use only integers and
+                                    ;; reuse the list used last time.
+                                    (replace-match-data t real-match-data)))
+                                  ((and (< (1+ (point)) (point-max))
+                                        (or (null limit)
+                                            (< (1+ (point)) limit)))
+                                   ;; If not accepting adjacent matches,
+                                   ;; move one char to the right before
+                                   ;; searching again.  Undo the motion
+                                   ;; if the search fails.
+                                   (let ((opoint (point)))
+                                     (forward-char 1)
+                                     (if (funcall
+                                          search-function search-string
+                                          limit t)
+                                         (replace-match-data
+                                          t real-match-data)
+                                       (goto-char opoint)
+                                       nil)))))))
 
           ;; Record whether the match is nonempty, to avoid an infinite loop
           ;; repeatedly matching the same empty string.
diff --git a/lisp/simple.el b/lisp/simple.el
index 3481a736648..d7541f68778 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -802,7 +802,7 @@ other words, it will work just like `just-one-space' command."
               (unless (= start end)
                 (cons orig-pos (buffer-substring start (point)))))
         ;; If this run causes no change in buffer content, delete all spaces,
-        ;; otherwise delete all excees spaces.
+        ;; otherwise delete all excess spaces.
         (delete-region (if (and (not single-shot) (zerop n) (= mid end))
                            start mid) end)
         (insert (make-string n ?\s))))
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 6ff4c720b71..eeb04ef250f 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -432,8 +432,7 @@ If you want to remember a region, supply a universal prefix to
 ;;;###autoload
 (defun remember-clipboard ()
   "Remember the contents of the current clipboard.
-Most useful for remembering things from Netscape or other X Windows
-application."
+Most useful for remembering things from other applications."
   (interactive)
   (remember (current-kill 0)))
 
diff --git a/src/ChangeLog b/src/ChangeLog
index b4c3195973c..092302d6492 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,68 @@
+2013-02-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Avoid file time stamp bug on MS-Windows (Bug#13149).
+        * fileio.c (Fwrite_region): Don't use the heuristic on empty files,
+        as FAT32 doesn't update time stamps when truncating them.
+        Also, check that a file time stamp is not a multiple of 100 ns;
+        this should catch all instances of the problem on MS-Windows,
+        as its native file system resolution is 100 ns or worse, and
+        checking for a non-multiple of 100 ns should impose only a small
+        overhead on systems with ns resolution.
+
+2013-02-02  Eli Zaretskii  <eliz@gnu.org>
+
+        Avoid encoding file names on MS-Windows when they need to be run
+        through dostounix_filename.
+        * w32.c (normalize_filename): Accept an additional argument
+        MULTIBYTE; if non-zero, traverse the file name by bytes and don't
+        downcase it even if w32-downcase-file-names is non-nil.
+        (dostounix_filename): Accept an additional argument MULTIBYTE and
+        pass it to normalize_filename.
+        (emacs_root_dir): Adjust.
+
+        * msdos.h (dostounix_filename): Adjust prototype.
+
+        * w32.h (dostounix_filename): Adjust prototype.
+
+        * msdos.c (dostounix_filename): Accept an additional argument and
+        ignore it.
+        (init_environment): Adjust callers of dostounix_filename.
+
+        * fileio.c (Ffile_name_directory, file_name_as_directory)
+        (directory_file_name, Fexpand_file_name)
+        (Fsubstitute_in_file_name): [DOS_NT] Adjust call to
+        dostounix_filename.
+        [WINDOWSNT]: Downcase file names if w32-downcase-file-names is
+        non-nil.
+        (Fsubstitute_in_file_name): [DOS_NT] Don't downcase environment
+        variables, as egetenv is case-insensitive for DOS_NT.
+
+        * dired.c (file_name_completion): Don't call Fdirectory_file_name
+        with an encoded file name.
+
+        * w32proc.c (Fw32_short_file_name, Fw32_long_file_name): Adjust
+        calls to dostounix_filename.
+
+        * w32fns.c (Fx_file_dialog): Adjust call to dostounix_filename.
+
+        * unexw32.c (unexec): Adjust call to dostounix_filename.
+
+        * termcap.c (tgetent) [MSDOS]: Adjust call to dostounix_filename.
+
+        * emacs.c (decode_env_path) [DOS_NT]: Adjust call to
+        dostounix_filename.
+
+        * callproc.c (Fcall_process) [MSDOS]: Adjust call to
+        dostounix_filename.
+
+        * callproc.c (Fcall_process): Make sure program name in PATH and
+        new_argv[0] is encoded, if needed.  Otherwise, un-encoded string
+        is passed to exec/spawnve, which fails unless the file-name
+        encoding is UTF-8.
+
+        * w32proc.c (sys_spawnve): Make sure escape_char is initialized,
+        even if w32-quote-process-args is nil.
+
 2013-02-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix timestamp bug when write-region appends nothing (Bug#13149).
diff --git a/src/callproc.c b/src/callproc.c
index 5eba3271358..ea79da7ff5a 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -445,28 +445,34 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     path = Fsubstring (path, make_number (2), Qnil);
 
   new_argv = SAFE_ALLOCA ((nargs > 4 ? nargs - 2 : 2) * sizeof *new_argv);
-  if (nargs > 4)
-    {
-      ptrdiff_t i;
-      struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
 
-      GCPRO5 (infile, buffer, current_dir, path, error_file);
-      argument_coding.dst_multibyte = 0;
-      for (i = 4; i < nargs; i++)
-        {
-          argument_coding.src_multibyte = STRING_MULTIBYTE (args[i]);
-          if (CODING_REQUIRE_ENCODING (&argument_coding))
-            /* We must encode this argument.  */
-            args[i] = encode_coding_string (&argument_coding, args[i], 1);
-        }
-      UNGCPRO;
-      for (i = 4; i < nargs; i++)
-        new_argv[i - 3] = SSDATA (args[i]);
-      new_argv[i - 3] = 0;
-    }
-  else
-    new_argv[1] = 0;
-  new_argv[0] = SSDATA (path);
+  {
+    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
+
+    GCPRO5 (infile, buffer, current_dir, path, error_file);
+    if (nargs > 4)
+      {
+        ptrdiff_t i;
+
+        argument_coding.dst_multibyte = 0;
+        for (i = 4; i < nargs; i++)
+          {
+            argument_coding.src_multibyte = STRING_MULTIBYTE (args[i]);
+            if (CODING_REQUIRE_ENCODING (&argument_coding))
+              /* We must encode this argument.  */
+              args[i] = encode_coding_string (&argument_coding, args[i], 1);
+          }
+        for (i = 4; i < nargs; i++)
+          new_argv[i - 3] = SSDATA (args[i]);
+        new_argv[i - 3] = 0;
+      }
+    else
+      new_argv[1] = 0;
+    if (STRING_MULTIBYTE (path))
+      path = ENCODE_FILE (path);
+    new_argv[0] = SSDATA (path);
+    UNGCPRO;
+  }
 
 #ifdef MSDOS /* MW, July 1993 */
 
@@ -481,7 +487,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
           tempfile = alloca (20);
           *tempfile = '\0';
         }
-      dostounix_filename (tempfile);
+      dostounix_filename (tempfile, 0);
       if (*tempfile == '\0' || tempfile[strlen (tempfile) - 1] != '/')
         strcat (tempfile, "/");
       strcat (tempfile, "detmp.XXX");
diff --git a/src/dired.c b/src/dired.c
index ed0571fe9fe..0e37568f211 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -484,9 +484,9 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
      on the encoded file name.  */
   encoded_file = STRING_MULTIBYTE (file) ? ENCODE_FILE (file) : file;
 
-  encoded_dir = ENCODE_FILE (dirname);
+  encoded_dir = ENCODE_FILE (Fdirectory_file_name (dirname));
 
-  d = open_directory (SSDATA (Fdirectory_file_name (encoded_dir)), &fd);
+  d = open_directory (SSDATA (encoded_dir), &fd);
   if (!d)
     report_file_error ("Opening directory", Fcons (dirname, Qnil));
 
diff --git a/src/emacs.c b/src/emacs.c
index 21c7a7cec03..ff29a042ea0 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2158,7 +2158,7 @@ decode_env_path (const char *evarname, const char *defalt)
     {
       char *path_copy = alloca (strlen (path) + 1);
       strcpy (path_copy, path);
-      dostounix_filename (path_copy);
+      dostounix_filename (path_copy, 0);
       path = path_copy;
     }
 #endif
diff --git a/src/fileio.c b/src/fileio.c
index fb6ecfedeb4..e76f2bc2420 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -383,11 +383,13 @@ Given a Unix syntax file name, returns a string ending in slash.  */)
 
       if (getdefdir (c_toupper (*beg) - 'A' + 1, r))
         {
-          if (!IS_DIRECTORY_SEP (res[strlen (res) - 1]))
+          size_t l = strlen (res);
+
+          if (l > 3 || !IS_DIRECTORY_SEP (res[l - 1]))
             strcat (res, "/");
           beg = res;
           p = beg + strlen (beg);
-          dostounix_filename (beg);
+          dostounix_filename (beg, 0);
           tem_fn = make_specified_string (beg, -1, p - beg,
                                           STRING_MULTIBYTE (filename));
         }
@@ -397,13 +399,16 @@ Given a Unix syntax file name, returns a string ending in slash.  */)
     }
   else if (STRING_MULTIBYTE (filename))
     {
-      tem_fn = ENCODE_FILE (make_specified_string (beg, -1, p - beg, 1));
-      dostounix_filename (SSDATA (tem_fn));
-      tem_fn = DECODE_FILE (tem_fn);
+      tem_fn = make_specified_string (beg, -1, p - beg, 1);
+      dostounix_filename (SSDATA (tem_fn), 1);
+#ifdef WINDOWSNT
+      if (!NILP (Vw32_downcase_file_names))
+        tem_fn = Fdowncase (tem_fn);
+#endif
     }
   else
     {
-      dostounix_filename (beg);
+      dostounix_filename (beg, 0);
       tem_fn = make_specified_string (beg, -1, p - beg, 0);
     }
   return tem_fn;
@@ -507,17 +512,7 @@ file_name_as_directory (char *dst, const char *src, ptrdiff_t srclen,
       srclen++;
     }
 #ifdef DOS_NT
-  if (multibyte)
-    {
-      Lisp_Object tem_fn = make_specified_string (dst, -1, srclen, 1);
-
-      tem_fn = ENCODE_FILE (tem_fn);
-      dostounix_filename (SSDATA (tem_fn));
-      tem_fn = DECODE_FILE (tem_fn);
-      memcpy (dst, SSDATA (tem_fn), (srclen = SBYTES (tem_fn)) + 1);
-    }
-  else
-    dostounix_filename (dst);
+  dostounix_filename (dst, multibyte);
 #endif
   return srclen;
 }
@@ -552,6 +547,10 @@ For a Unix-syntax file name, just appends a slash.  */)
       error ("Invalid handler in `file-name-handler-alist'");
     }
 
+#ifdef WINDOWSNT
+  if (!NILP (Vw32_downcase_file_names))
+    file = Fdowncase (file);
+#endif
   buf = alloca (SBYTES (file) + 10);
   length = file_name_as_directory (buf, SSDATA (file), SBYTES (file),
                                    STRING_MULTIBYTE (file));
@@ -580,17 +579,7 @@ directory_file_name (char *dst, char *src, ptrdiff_t srclen, bool multibyte)
       srclen--;
     }
 #ifdef DOS_NT
-  if (multibyte)
-    {
-      Lisp_Object tem_fn = make_specified_string (dst, -1, srclen, 1);
-
-      tem_fn = ENCODE_FILE (tem_fn);
-      dostounix_filename (SSDATA (tem_fn));
-      tem_fn = DECODE_FILE (tem_fn);
-      memcpy (dst, SSDATA (tem_fn), (srclen = SBYTES (tem_fn)) + 1);
-    }
-  else
-    dostounix_filename (dst);
+  dostounix_filename (dst, multibyte);
 #endif
   return srclen;
 }
@@ -625,6 +614,10 @@ In Unix-syntax, this function just removes the final slash.  */)
       error ("Invalid handler in `file-name-handler-alist'");
     }
 
+#ifdef WINDOWSNT
+  if (!NILP (Vw32_downcase_file_names))
+    directory = Fdowncase (directory);
+#endif
   buf = alloca (SBYTES (directory) + 20);
   length = directory_file_name (buf, SSDATA (directory), SBYTES (directory),
                                 STRING_MULTIBYTE (directory));
@@ -925,6 +918,11 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
         }
     }
 
+#ifdef WINDOWSNT
+  if (!NILP (Vw32_downcase_file_names))
+    default_directory = Fdowncase (default_directory);
+#endif
+
   /* Make a local copy of nm[] to protect it from GC in DECODE_FILE below.  */
   nm = alloca (SBYTES (name) + 1);
   memcpy (nm, SSDATA (name), SBYTES (name) + 1);
@@ -1008,18 +1006,7 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
 #ifdef DOS_NT
           /* Make sure directories are all separated with /, but
              avoid allocation of a new string when not required. */
-          if (multibyte)
-            {
-              Lisp_Object tem_name = make_specified_string (nm, -1, strlen (nm),
-                                                            multibyte);
-
-              tem_name = ENCODE_FILE (tem_name);
-              dostounix_filename (SSDATA (tem_name));
-              tem_name = DECODE_FILE (tem_name);
-              memcpy (nm, SSDATA (tem_name), SBYTES (tem_name) + 1);
-            }
-          else
-            dostounix_filename (nm);
+          dostounix_filename (nm, multibyte);
 #ifdef WINDOWSNT
           if (IS_DIRECTORY_SEP (nm[1]))
             {
@@ -1037,6 +1024,10 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
               temp[0] = DRIVE_LETTER (drive);
               name = concat2 (build_string (temp), name);
             }
+#ifdef WINDOWSNT
+          if (!NILP (Vw32_downcase_file_names))
+            name = Fdowncase (name);
+#endif
           return name;
 #else /* not DOS_NT */
           if (strcmp (nm, SSDATA (name)) == 0)
@@ -1400,14 +1391,11 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
         target[1] = ':';
       }
     result = make_specified_string (target, -1, o - target, multibyte);
-    if (multibyte)
-      {
-        result = ENCODE_FILE (result);
-        dostounix_filename (SSDATA (result));
-        result = DECODE_FILE (result);
-      }
-    else
-      dostounix_filename (SSDATA (result));
+    dostounix_filename (SSDATA (result), multibyte);
+#ifdef WINDOWSNT
+    if (!NILP (Vw32_downcase_file_names))
+      result = Fdowncase (result);
+#endif
 #else  /* !DOS_NT */
     result = make_specified_string (target, -1, o - target, multibyte);
 #endif /* !DOS_NT */
@@ -1689,24 +1677,8 @@ those `/' is discarded.  */)
   memcpy (nm, SDATA (filename), SBYTES (filename) + 1);
 
 #ifdef DOS_NT
-  if (multibyte)
-    {
-      Lisp_Object encoded_filename = ENCODE_FILE (filename);
-      Lisp_Object tem_fn;
-
-      dostounix_filename (SDATA (encoded_filename));
-      tem_fn = DECODE_FILE (encoded_filename);
-      nm = alloca (SBYTES (tem_fn) + 1);
-      memcpy (nm, SDATA (tem_fn), SBYTES (tem_fn) + 1);
-      substituted = (memcmp (nm, SDATA (filename), SBYTES (filename)) != 0);
-      if (substituted)
-        filename = tem_fn;
-    }
-  else
-    {
-      dostounix_filename (nm);
-      substituted = (memcmp (nm, SDATA (filename), SBYTES (filename)) != 0);
-    }
+  dostounix_filename (nm, multibyte);
+  substituted = (memcmp (nm, SDATA (filename), SBYTES (filename)) != 0);
 #endif
   endp = nm + SBYTES (filename);
 
@@ -1780,7 +1752,13 @@ those `/' is discarded.  */)
       }
 
   if (!substituted)
-    return filename;
+    {
+#ifdef WINDOWSNT
+      if (!NILP (Vw32_downcase_file_names))
+        filename = Fdowncase (filename);
+#endif
+      return filename;
+    }
 
   /* If substitution required, recopy the string and do it.  */
   /* Make space in stack frame for the new copy.  */
@@ -1819,9 +1797,6 @@ those `/' is discarded.  */)
         target = alloca (s - o + 1);
         memcpy (target, o, s - o);
         target[s - o] = 0;
-#ifdef DOS_NT
-        strupr (target); /* $home == $HOME etc.  */
-#endif /* DOS_NT */
 
         /* Get variable value.  */
         o = egetenv (target);
@@ -1858,6 +1833,16 @@ those `/' is discarded.  */)
        need to quote some $ to $$ first.  */
     xnm = p;
 
+#ifdef WINDOWSNT
+  if (!NILP (Vw32_downcase_file_names))
+    {
+      Lisp_Object xname = make_specified_string (xnm, -1, x - xnm, multibyte);
+
+      xname = Fdowncase (xname);
+      return xname;
+    }
+  else
+#endif
   return make_specified_string (xnm, -1, x - xnm, multibyte);
 
  badsubst:
@@ -5035,11 +5020,22 @@ This calls `write-region-annotate-functions' at the start, and
           if (fstat (desc1, &st1) == 0
               && st.st_dev == st1.st_dev && st.st_ino == st1.st_ino)
             {
+              /* Use the heuristic if it appears to be valid.  With neither
+                 O_EXCL nor O_TRUNC, if Emacs happened to write nothing to the
+                 file, the time stamp won't change.  Also, some non-POSIX
+                 systems don't update an empty file's time stamp when
+                 truncating it.  Finally, file systems with 100 ns or worse
+                 resolution sometimes seem to have bugs: on a system with ns
+                 resolution, checking ns % 100 incorrectly avoids the heuristic
+                 1% of the time, but the problem should be temporary as we will
+                 try again on the next time stamp.  */
+              bool use_heuristic
+                = ((open_flags & (O_EXCL | O_TRUNC)) != 0
+                   && st.st_size != 0
+                   && EMACS_NSECS (modtime) % 100 != 0);
+
               EMACS_TIME modtime1 = get_stat_mtime (&st1);
-              /* If neither O_EXCL nor O_TRUNC is used, and Emacs happened to
-                 write nothing to the file, the file's time stamp won't change
-                 so it should not be used in this heuristic.  */
-              if ((open_flags & (O_EXCL | O_TRUNC)) != 0
+              if (use_heuristic
                   && EMACS_TIME_EQ (modtime, modtime1)
                   && st.st_size == st1.st_size)
                 {
diff --git a/src/msdos.c b/src/msdos.c
index 5174bc4dfcd..1b2deaf7478 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -3339,7 +3339,7 @@ void msdos_downcase_filename (unsigned char *);
 /* Destructively turn backslashes into slashes.  */
 
 void
-dostounix_filename (char *p)
+dostounix_filename (char *p, int ignore)
 {
   msdos_downcase_filename (p);
 
@@ -3603,7 +3603,7 @@ init_environment (int argc, char **argv, int skip_args)
   if (!s) s = "c:/command.com";
   t = alloca (strlen (s) + 1);
   strcpy (t, s);
-  dostounix_filename (t);
+  dostounix_filename (t, 0);
   setenv ("SHELL", t, 0);
 
   /* PATH is also downcased and backslashes mirrored.  */
@@ -3613,7 +3613,7 @@ init_environment (int argc, char **argv, int skip_args)
   /* Current directory is always considered part of MsDos's path but it is
      not normally mentioned.  Now it is.  */
   strcat (strcpy (t, ".;"), s);
-  dostounix_filename (t); /* Not a single file name, but this should work.  */
+  dostounix_filename (t, 0); /* Not a single file name, but this should work.  */
   setenv ("PATH", t, 1);
 
   /* In some sense all dos users have root privileges, so...  */
diff --git a/src/msdos.h b/src/msdos.h
index 57609d62218..ee0d49464ae 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -29,7 +29,7 @@ void dos_set_window_size (int *, int *);
 
 int getdefdir (int, char*);
 void unixtodos_filename (char *);
-void dostounix_filename (char *);
+void dostounix_filename (char *, int);
 char *rootrelativepath (char *);
 void init_environment (int, char **, int);
 void internal_terminal_init (void);
diff --git a/src/termcap.c b/src/termcap.c
index 82c2b1fda07..99bbfce27f5 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -393,7 +393,7 @@ tgetent (char *bp, const char *name)
   if (termcap_name && (*termcap_name == '\\'
                        || *termcap_name == '/'
                        || termcap_name[1] == ':'))
-    dostounix_filename (termcap_name);
+    dostounix_filename (termcap_name, 0);
 #endif
 
   filep = termcap_name && valid_filename_p (termcap_name);
diff --git a/src/unexw32.c b/src/unexw32.c
index 66071295727..e8b553a87d3 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -722,7 +722,7 @@ unexec (const char *new_name, const char *old_name)
   /* Ignore old_name, and get our actual location from the OS.  */
   if (!GetModuleFileName (NULL, in_filename, MAX_PATH))
     abort ();
-  dostounix_filename (in_filename);
+  dostounix_filename (in_filename, 0);
   strcpy (out_filename, in_filename);
 
   /* Change the base of the output filename to match the requested name.  */
diff --git a/src/w32.c b/src/w32.c
index 64f8a0335ac..8b89bd3e660 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1598,12 +1598,17 @@ max_filename_mbslen (void)
    case path name components to lower case.  */
 
 static void
-normalize_filename (register char *fp, char path_sep)
+normalize_filename (register char *fp, char path_sep, int multibyte)
 {
   char sep;
   char *elem, *p2;
   int dbcs_p = max_filename_mbslen () > 1;
 
+  /* Multibyte file names are in the Emacs internal representation, so
+     we can traverse them by bytes with no problems.  */
+  if (multibyte)
+    dbcs_p = 0;
+
   /* Always lower-case drive letters a-z, even if the filesystem
      preserves case in filenames.
      This is so filenames can be compared by string comparison
@@ -1620,7 +1625,7 @@ normalize_filename (register char *fp, char path_sep)
       fp += 2;
     }
 
-  if (NILP (Vw32_downcase_file_names))
+  if (multibyte || NILP (Vw32_downcase_file_names))
     {
       while (*fp)
         {
@@ -1668,18 +1673,20 @@ normalize_filename (register char *fp, char path_sep)
   } while (*fp);
 }
 
-/* Destructively turn backslashes into slashes.  */
+/* Destructively turn backslashes into slashes.  MULTIBYTE non-zero
+   means the file name is a multibyte string in Emacs's internal
+   representation.  */
 void
-dostounix_filename (register char *p)
+dostounix_filename (register char *p, int multibyte)
 {
-  normalize_filename (p, '/');
+  normalize_filename (p, '/', multibyte);
 }
 
 /* Destructively turn slashes into backslashes.  */
 void
 unixtodos_filename (register char *p)
 {
-  normalize_filename (p, '\\');
+  normalize_filename (p, '\\', 0);
 }
 
 /* Remove all CR's that are followed by a LF.
@@ -2222,7 +2229,7 @@ emacs_root_dir (void)
     emacs_abort ();
   strcpy (root_dir, p);
   root_dir[parse_root (root_dir, NULL)] = '\0';
-  dostounix_filename (root_dir);
+  dostounix_filename (root_dir, 0);
   return root_dir;
 }
 
@@ -4280,7 +4287,7 @@ fstatat (int fd, char const *name, struct stat *st, int flags)
   /* Rely on a hack: an open directory is modeled as file descriptor 0.
      This is good enough for the current usage in Emacs, but is fragile.
 
-     FIXME: Add proper support for fdopendir, fstatatat, readlinkat.
+     FIXME: Add proper support for fdopendir, fstatat, readlinkat.
      Gnulib does this and can serve as a model.  */
   char fullname[MAX_PATH];
 
diff --git a/src/w32.h b/src/w32.h
index 895e7f31d63..6bf165f52ba 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -180,7 +180,7 @@ extern void init_environment (char **);
 extern void check_windows_init_file (void);
 extern void syms_of_ntproc (void);
 extern void syms_of_ntterm (void);
-extern void dostounix_filename (register char *);
+extern void dostounix_filename (register char *, int);
 extern void unixtodos_filename (register char *);
 extern BOOL init_winsock (int load_now);
 extern void srandom (int);
diff --git a/src/w32fns.c b/src/w32fns.c
index 6c098cae3a3..0841ad3468e 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6254,7 +6254,7 @@ Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.  */)
             /* we get one of the two final 0 bytes for free. */
             1 + sizeof (wchar_t) * wcslen (filename_buf)));
 #else /* !NTGUI_UNICODE */
-        dostounix_filename (filename_buf);
+        dostounix_filename (filename_buf, 0);
         filename = DECODE_FILE (build_string (filename_buf));
 #endif /* NTGUI_UNICODE */
 
diff --git a/src/w32proc.c b/src/w32proc.c
index 0fcb2993020..8bf57602927 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1541,7 +1541,6 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
   child_process *cp;
   int is_dos_app, is_cygnus_app, is_gui_app;
   int do_quoting = 0;
-  char escape_char;
   /* We pass our process ID to our children by setting up an environment
      variable in their environment.  */
   char ppid_env_var_buffer[64];
@@ -1554,6 +1553,8 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
      Some extra whitespace characters need quoting in Cygwin programs,
      so this list is conditionally modified below.  */
   char *sepchars = " \t*?";
+  /* This is for native w32 apps; modified below for Cygwin apps.  */
+  char escape_char = '\\';
 
   /* We don't care about the other modes */
   if (mode != _P_NOWAIT)
@@ -2557,8 +2558,9 @@ All path elements in FILENAME are converted to their short names.  */)
   if (GetShortPathName (SDATA (ENCODE_FILE (filename)), shortname, MAX_PATH) == 0)
     return Qnil;
 
-  dostounix_filename (shortname);
+  dostounix_filename (shortname, 0);
 
+  /* No need to DECODE_FILE, because 8.3 names are pure ASCII.   */
   return build_string (shortname);
 }
 
@@ -2585,7 +2587,7 @@ All path elements in FILENAME are converted to their long names.  */)
   if (!w32_get_long_filename (SDATA (ENCODE_FILE (filename)), longname, MAX_PATH))
     return Qnil;
 
-  dostounix_filename (longname);
+  dostounix_filename (longname, 0);
 
   /* If we were passed only a drive, make sure that a slash is not appended
      for consistency with directories.  Allow for drive mapping via SUBST