diff options
| author | Paul Eggert | 2018-03-10 18:30:54 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-03-10 18:30:54 -0800 |
| commit | a3f26048a9b115e8dabffaa768128eaccd07dfd3 (patch) | |
| tree | 1a2be0f6fbceab35f2b14f91683cff5bacdf1134 /src | |
| parent | ab04a0941b67a76575b99d89ba7ba3db1169b901 (diff) | |
| parent | 5c91ca8f30098cb2593ca375daa82d25aef03ad7 (diff) | |
| download | emacs-a3f26048a9b115e8dabffaa768128eaccd07dfd3.tar.gz emacs-a3f26048a9b115e8dabffaa768128eaccd07dfd3.zip | |
Merge from origin/emacs-26
5c91ca8 Fix create_process bug breaking eudc-expand-inline
e244fed Clarify that nil doesn't match itself as a cl-case clause (Bu...
df0e7e2 Improve SVG documentation
a34ef52 Document the "URL" keyword in library headers
fbc7f9a * test/lisp/international/mule-tests.el: Avoid local variable...
16faff6 ; * lisp/org/org-table.el: Replace obsolete alias in comment.
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index 6ba27a33f4d..9b9b9f35503 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2096,9 +2096,9 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) | |||
| 2096 | { | 2096 | { |
| 2097 | /* Make the pty be the controlling terminal of the process. */ | 2097 | /* Make the pty be the controlling terminal of the process. */ |
| 2098 | #ifdef HAVE_PTYS | 2098 | #ifdef HAVE_PTYS |
| 2099 | /* First, disconnect its current controlling terminal. */ | 2099 | /* First, disconnect its current controlling terminal. |
| 2100 | if (pty_flag) | 2100 | Do this even if !PTY_FLAG; see Bug#30762. */ |
| 2101 | setsid (); | 2101 | setsid (); |
| 2102 | /* Make the pty's terminal the controlling terminal. */ | 2102 | /* Make the pty's terminal the controlling terminal. */ |
| 2103 | if (pty_flag && forkin >= 0) | 2103 | if (pty_flag && forkin >= 0) |
| 2104 | { | 2104 | { |