diff options
| author | Vincent Belaïche | 2016-01-20 08:30:51 +0100 |
|---|---|---|
| committer | Vincent Belaïche | 2016-01-20 08:30:51 +0100 |
| commit | b895c72059521fec064ff27b4cfcfa4104081c4e (patch) | |
| tree | c1697f0e4d95d8c3556798f6c4c53c98a4714bd0 /lisp/eshell | |
| parent | badcd38aa86ed7973f2be2743c405710973a0bdd (diff) | |
| parent | 1b76d9168336ede8976b980aeaed64ae2908501a (diff) | |
| download | emacs-b895c72059521fec064ff27b4cfcfa4104081c4e.tar.gz emacs-b895c72059521fec064ff27b4cfcfa4104081c4e.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-term.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el index aabc5fdb1a2..3e5de0c0097 100644 --- a/lisp/eshell/em-term.el +++ b/lisp/eshell/em-term.el | |||
| @@ -136,6 +136,7 @@ character to the invoked process." | |||
| 136 | "If non-nil, term buffers are destroyed after their processes die. | 136 | "If non-nil, term buffers are destroyed after their processes die. |
| 137 | WARNING: Setting this to non-nil may result in unexpected | 137 | WARNING: Setting this to non-nil may result in unexpected |
| 138 | behavior for short-lived processes, see bug#18108." | 138 | behavior for short-lived processes, see bug#18108." |
| 139 | :version "25.1" | ||
| 139 | :type 'boolean | 140 | :type 'boolean |
| 140 | :group 'eshell-term) | 141 | :group 'eshell-term) |
| 141 | 142 | ||