aboutsummaryrefslogtreecommitdiffstats
path: root/src/callproc.c
diff options
context:
space:
mode:
authorPaul Eggert2012-04-09 12:51:06 -0700
committerPaul Eggert2012-04-09 12:51:06 -0700
commit9f46df23a3d01f82a24f2a3dd8730f0263fa9fde (patch)
treee10467a42658a374d5cdb7bb25fc94016abdad7a /src/callproc.c
parentb8df54ffbefc5ddf40ddcda68a2a682769c5833d (diff)
parenta130c2afed5e7d5ec10efa1a57f4de2461a9c778 (diff)
downloademacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.tar.gz
emacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.zip
Merge from trunk; add Bug#.
Diffstat (limited to 'src/callproc.c')
-rw-r--r--src/callproc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/callproc.c b/src/callproc.c
index b5b8cadeb68..9528c9644d8 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1637,16 +1637,16 @@ syms_of_callproc (void)
1637 staticpro (&Vtemp_file_name_pattern); 1637 staticpro (&Vtemp_file_name_pattern);
1638 1638
1639 DEFVAR_LISP ("shell-file-name", Vshell_file_name, 1639 DEFVAR_LISP ("shell-file-name", Vshell_file_name,
1640 doc: /* *File name to load inferior shells from. 1640 doc: /* File name to load inferior shells from.
1641Initialized from the SHELL environment variable, or to a system-dependent 1641Initialized from the SHELL environment variable, or to a system-dependent
1642default if SHELL is not set. */); 1642default if SHELL is not set. */);
1643 1643
1644 DEFVAR_LISP ("exec-path", Vexec_path, 1644 DEFVAR_LISP ("exec-path", Vexec_path,
1645 doc: /* *List of directories to search programs to run in subprocesses. 1645 doc: /* List of directories to search programs to run in subprocesses.
1646Each element is a string (directory name) or nil (try default directory). */); 1646Each element is a string (directory name) or nil (try default directory). */);
1647 1647
1648 DEFVAR_LISP ("exec-suffixes", Vexec_suffixes, 1648 DEFVAR_LISP ("exec-suffixes", Vexec_suffixes,
1649 doc: /* *List of suffixes to try to find executable file names. 1649 doc: /* List of suffixes to try to find executable file names.
1650Each element is a string. */); 1650Each element is a string. */);
1651 Vexec_suffixes = Qnil; 1651 Vexec_suffixes = Qnil;
1652 1652