aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorPaul Eggert2012-01-07 11:51:13 -0800
committerPaul Eggert2012-01-07 11:51:13 -0800
commit9a0115abd18f219f234d6dd460cf7f5ed3c0332f (patch)
tree3ea55596e8d2fbb066b4387d86b509d8f8a1a612 /src/process.c
parentdbf17d8b483f08f9506c19ef95e894fca62b8ec7 (diff)
parent6c1bd3f369c39aac648b085c5e9e4e9b42c65c62 (diff)
downloademacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.tar.gz
emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.zip
Merge from trunk.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c
index 4b0f90b58af..3dc753f5159 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,6 +1,6 @@
1/* Asynchronous subprocess control for GNU Emacs. 1/* Asynchronous subprocess control for GNU Emacs.
2 2
3Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2011 3Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2012
4 Free Software Foundation, Inc. 4 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
@@ -3492,7 +3492,7 @@ usage: (make-network-process &rest ARGS) */)
3492 || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))) 3492 || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters))))
3493 /* We dare not decode end-of-line format by setting VAL to 3493 /* We dare not decode end-of-line format by setting VAL to
3494 Qraw_text, because the existing Emacs Lisp libraries 3494 Qraw_text, because the existing Emacs Lisp libraries
3495 assume that they receive bare code including a sequene of 3495 assume that they receive bare code including a sequence of
3496 CR LF. */ 3496 CR LF. */
3497 val = Qnil; 3497 val = Qnil;
3498 else 3498 else