summaryrefslogtreecommitdiff
path: root/lisp/term.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-01-31 07:50:23 -0800
committerGlenn Morris <rgm@gnu.org>2018-01-31 07:50:23 -0800
commit4dbc1ef5e6cf55426d023be563ff93d74b675218 (patch)
tree1fabaf73b948f9b1d8d28d63e83571b74ad88ce0 /lisp/term.el
parent84d066a73fc4191a675c87c81ec1a4f531375e95 (diff)
parent22922c7c67efdcb42ba4bf35b0ea507cca08f559 (diff)
downloademacs-4dbc1ef5e6cf55426d023be563ff93d74b675218.tar.gz
Merge from origin/emacs-26
22922c7 (origin/emacs-26) * doc/emacs/entering.texi (Entering Emacs):... 59657c4 Document 'window-at-side-p' in the Elisp manual 2b35ed0 Document external-debugging-output in the Elisp Manual (Bug#2... db6564c Fix scroll-margin docstring (Bug#13791) 732d1b9 Clarify that `ansi-term' is almost the same as `term' (Bug#18... f706c59 Update manual description of locate-file (Bug#23650) 1602262 Clarify effect of print-gensym (Bug#27776) 53e9fa2 * lisp/custom.el (defcustom): Fix docstring (Bug#27891). 607cc4e Define cl-type-definition button type as needed (Bug#28899) 9e6889c Emphasize that GPG passphrase caching is temporary (Bug#29907) 4b5711b Fix @examples in cc-mode.info, where lines were getting glued... 71961f1 Minor change in "Mode Line" section of Emacs manual 55a2b76 More fixes in the Emacs manual
Diffstat (limited to 'lisp/term.el')
-rw-r--r--lisp/term.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/term.el b/lisp/term.el
index 20719987a06..a0313d88dac 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -4139,7 +4139,9 @@ the process. Any more args are arguments to PROGRAM."
;;;###autoload
(defun ansi-term (program &optional new-buffer-name)
- "Start a terminal-emulator in a new buffer."
+ "Start a terminal-emulator in a new buffer.
+This is almost the same as `term' apart from always creating a new buffer,
+and `C-x' being marked as a `term-escape-char'. "
(interactive (list (read-from-minibuffer "Run program: "
(or explicit-shell-file-name
(getenv "ESHELL")