aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorPaul Eggert2012-01-09 09:36:10 -0800
committerPaul Eggert2012-01-09 09:36:10 -0800
commit35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch)
tree90358cbb033a126c4d48793a80fd804b7baaca24 /src/process.c
parent59815c02506eb39b61e672528ed03885749ba529 (diff)
parent7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff)
downloademacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz
emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.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 206af7059fb..b4fca389d0d 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.
@@ -3488,7 +3488,7 @@ usage: (make-network-process &rest ARGS) */)
3488 || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))) 3488 || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters))))
3489 /* We dare not decode end-of-line format by setting VAL to 3489 /* We dare not decode end-of-line format by setting VAL to
3490 Qraw_text, because the existing Emacs Lisp libraries 3490 Qraw_text, because the existing Emacs Lisp libraries
3491 assume that they receive bare code including a sequene of 3491 assume that they receive bare code including a sequence of
3492 CR LF. */ 3492 CR LF. */
3493 val = Qnil; 3493 val = Qnil;
3494 else 3494 else