From: Karl Otness <karl@karlotness.com>
Date: Sun, 22 Apr 2018 03:01:11 +0000 (-0400)
Subject: Fix pre- and post-command-hook errors in term.el
X-Git-Tag: emacs-26.1~60
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d6e2c59;p=emacs.git

Fix pre- and post-command-hook errors in term.el

Before this patch, after the terminal process dies the command
hooks added in term-mode's char mode would produce errors.
This fix removes these hooks when the process dies.
* lisp/term.el (term-handle-exit): Remove pre-command-hook and
post-command-hook because the process is dead.  (Bug#31236)

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/term.el b/lisp/term.el
index 6860ea69342..75c27797838 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1484,6 +1484,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)