diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/callproc.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/callproc.c b/src/callproc.c index eb2a2268fe1..3726eb3cc7f 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -96,7 +96,7 @@ int synch_process_retcode; | |||
| 96 | /* Nonzero if this is termination due to exit. */ | 96 | /* Nonzero if this is termination due to exit. */ |
| 97 | static int call_process_exited; | 97 | static int call_process_exited; |
| 98 | 98 | ||
| 99 | EXFUN (Fgetenv_internal, 2); | 99 | static Lisp_Object Fgetenv_internal (Lisp_Object, Lisp_Object); |
| 100 | 100 | ||
| 101 | static Lisp_Object | 101 | static Lisp_Object |
| 102 | call_process_kill (Lisp_Object fdpid) | 102 | call_process_kill (Lisp_Object fdpid) |