diff options
| author | Miles Bader | 2007-01-01 03:21:06 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-01-01 03:21:06 +0000 |
| commit | 4c34eeeee5886d14f3e60b77fb563cb549c8896f (patch) | |
| tree | af17010f0864173dd6416585f08d686377791412 /src/callproc.c | |
| parent | 76acf92ebe73e35528c5966a21328305ba7b5aef (diff) | |
| parent | db6292445840e2795f35ebad62a14314fc3c7c21 (diff) | |
| download | emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.tar.gz emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 563-582)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 177-185)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/callproc.c b/src/callproc.c index d8eebac08a6..819e7ff4a32 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1553,7 +1553,8 @@ syms_of_callproc () | |||
| 1553 | 1553 | ||
| 1554 | DEFVAR_LISP ("shell-file-name", &Vshell_file_name, | 1554 | DEFVAR_LISP ("shell-file-name", &Vshell_file_name, |
| 1555 | doc: /* *File name to load inferior shells from. | 1555 | doc: /* *File name to load inferior shells from. |
| 1556 | Initialized from the SHELL environment variable. */); | 1556 | Initialized from the SHELL environment variable, or to a system-dependent |
| 1557 | default if SHELL is not set. */); | ||
| 1557 | 1558 | ||
| 1558 | DEFVAR_LISP ("exec-path", &Vexec_path, | 1559 | DEFVAR_LISP ("exec-path", &Vexec_path, |
| 1559 | doc: /* *List of directories to search programs to run in subprocesses. | 1560 | doc: /* *List of directories to search programs to run in subprocesses. |