diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-05-01 07:50:48 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-05-01 07:50:48 -0700 |
| commit | 62032f699a4969ffacd9b8ea9dccd3ce6b10051f (patch) | |
| tree | 357983c747ff7af985339027113adbc942f0edcd /lisp/term.el | |
| parent | b3b4697ff8b9093cef2cc3842dab731f37c9e2e1 (diff) | |
| parent | 71be806d01c4e135f067bc842a9d684e594b4f35 (diff) | |
| download | emacs-62032f699a4969ffacd9b8ea9dccd3ce6b10051f.tar.gz | |
Merge from origin/emacs-26
71be806 ; * etc/DEBUG: Minor clarification.
4403f89 Update the Emacs FAQ
40b3317 * etc/DEBUG: Minor copyedits.
850ff18 Clarify wording of NS drag n drop documentation
343d70b1 Improve kill-related documentation (bug#31209)
0b43224 * lisp/simple.el (region-extract-function): Don't hide the 'n...
d6e2c59 Fix pre- and post-command-hook errors in term.el
6cf83131e * doc/lispref/display.texi (Glyphless Chars): Fix grammar.
88d178c Fix macOS drag n drop event documentation
Diffstat (limited to 'lisp/term.el')
| -rw-r--r-- | lisp/term.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/term.el b/lisp/term.el index cfb39c34e53..017b0221ecb 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -1456,6 +1456,9 @@ The main purpose is to get rid of the local keymap." (let ((buffer-read-only nil) (omax (point-max)) (opoint (point))) + ;; Remove hooks to avoid errors due to dead process. + (remove-hook 'pre-command-hook #'term-set-goto-process-mark t) + (remove-hook 'post-command-hook #'term-goto-process-mark-maybe t) ;; Record where we put the message, so we can ignore it ;; later on. (goto-char omax) |