Merge from origin/emacs-24

f160106 Avoid assertion violations in Rmail due to newline cache
1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote
1817892 Avoid erratic behavior of menu-bar tooltips on w32  (Bug#19925)
0260932 Bump python.el version
b0adfc7 Spelling fixes
35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged.
86fe750 # Remove NEWS temporary markup
4fa778b erc.el: Add old version header for package.el compatibilty
9366f05 Tramp: Disable paging with PAGER=cat

Conflicts:
	admin/notes/repo
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog

1 files changed, 1 insertions, 1 deletions

diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 3157a69c1b6..d4832ea9cef 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -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;
                 }