Merge from origin/emacs-25

[gnu-emacs] / nt / cmdproxy.c

diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 3157a69c1b62800e0597003d7771da97ca8faaf2..411a409bacaa0e1130ab31ae0c3e2c57589610f5 100644 (file)
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,5 +1,5 @@
 /* Proxy shell designed for use with Emacs on Windows 95 and NT.
-   Copyright (C) 1997, 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001-2016 Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatibility
    with elisp code written for Unix.  When possible, executes external
@@ -16,8 +16,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -220,7 +220,7 @@ get_next_token (char * buf, const char ** pSrc)
                {
                  /* Output literal backslashes.  Note that we don't
                     treat a backslash as an escape character here,
-                    since it doesn't preceed a quote.  */
+                    since it doesn't precede a quote.  */
                  for ( ; escape_char_run > 0; escape_char_run--)
                    *o++ = escape_char;
                }