diff options
| author | Paul Eggert | 2012-04-09 15:54:59 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-09 15:54:59 -0700 |
| commit | 45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193 (patch) | |
| tree | 5bc87a8b5a3c754b8eb44a612cc6c03561d6b968 /src/callproc.c | |
| parent | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (diff) | |
| parent | 05920a43fc18e696b464387e781e7cfdcea5b5af (diff) | |
| download | emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.tar.gz emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.zip | |
Merge from trunk.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/callproc.c b/src/callproc.c index e17e082a0d4..1dd56749e16 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1646,16 +1646,16 @@ syms_of_callproc (void) | |||
| 1646 | staticpro (&Vtemp_file_name_pattern); | 1646 | staticpro (&Vtemp_file_name_pattern); |
| 1647 | 1647 | ||
| 1648 | DEFVAR_LISP ("shell-file-name", Vshell_file_name, | 1648 | DEFVAR_LISP ("shell-file-name", Vshell_file_name, |
| 1649 | doc: /* *File name to load inferior shells from. | 1649 | doc: /* File name to load inferior shells from. |
| 1650 | Initialized from the SHELL environment variable, or to a system-dependent | 1650 | Initialized from the SHELL environment variable, or to a system-dependent |
| 1651 | default if SHELL is not set. */); | 1651 | default if SHELL is not set. */); |
| 1652 | 1652 | ||
| 1653 | DEFVAR_LISP ("exec-path", Vexec_path, | 1653 | DEFVAR_LISP ("exec-path", Vexec_path, |
| 1654 | doc: /* *List of directories to search programs to run in subprocesses. | 1654 | doc: /* List of directories to search programs to run in subprocesses. |
| 1655 | Each element is a string (directory name) or nil (try default directory). */); | 1655 | Each element is a string (directory name) or nil (try default directory). */); |
| 1656 | 1656 | ||
| 1657 | DEFVAR_LISP ("exec-suffixes", Vexec_suffixes, | 1657 | DEFVAR_LISP ("exec-suffixes", Vexec_suffixes, |
| 1658 | doc: /* *List of suffixes to try to find executable file names. | 1658 | doc: /* List of suffixes to try to find executable file names. |
| 1659 | Each element is a string. */); | 1659 | Each element is a string. */); |
| 1660 | Vexec_suffixes = Qnil; | 1660 | Vexec_suffixes = Qnil; |
| 1661 | 1661 | ||