emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/eat 0586a84e52: Fix incompatiblity with Eshell on Emacs 28


From: ELPA Syncer
Subject: [nongnu] elpa/eat 0586a84e52: Fix incompatiblity with Eshell on Emacs 28
Date: Tue, 21 Mar 2023 11:00:26 -0400 (EDT)

branch: elpa/eat
commit 0586a84e521fc7ed9febc430039c4baba95889d7
Author: Akib Azmain Turja <akib@disroot.org>
Commit: Akib Azmain Turja <akib@disroot.org>

    Fix incompatiblity with Eshell on Emacs 28
    
    * eat.el (eat--eshell-setup-proc-and-term): Set
    'eat--input-process' terminal parameter on Emacs 28.
    * eat.el (eat-eshell-mode): Don't add advice
    'eat--eshell-set-input-process' on Emacs 28.
---
 eat.el | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/eat.el b/eat.el
index 49599d0d03..e4a4a59499 100644
--- a/eat.el
+++ b/eat.el
@@ -5747,6 +5747,9 @@ PROGRAM can be a shell command."
     (setf (eat-term-set-cwd-function eat--terminal) #'eat--set-cwd)
     (setf (eat-term-set-cmd-function eat--terminal) #'eat--set-cmd)
     (setf (eat-term-parameter eat--terminal 'eat--process) proc)
+    (unless (>= emacs-major-version 29)
+      (setf (eat-term-parameter eat--terminal 'eat--input-process)
+            proc))
     (setf (eat-term-parameter eat--terminal 'eat--output-process)
           proc)
     (when-let* ((window (get-buffer-window nil t)))
@@ -6082,8 +6085,9 @@ symbol `buffer', in which case the point of current 
buffer is set."
             ,@eshell-variable-aliases-list))
     (advice-add #'eshell-gather-process-output :around
                 #'eat--eshell-adjust-make-process-args)
-    (advice-add #'eshell-resume-eval :after
-                #'eat--eshell-set-input-process))
+    (when (>= emacs-major-version 29)
+      (advice-add #'eshell-resume-eval :after
+                  #'eat--eshell-set-input-process)))
    (t
     (let ((buffers nil))
       (setq eat-eshell-mode t)
@@ -6115,8 +6119,9 @@ symbol `buffer', in which case the point of current 
buffer is set."
            eshell-variable-aliases-list))
     (advice-remove #'eshell-gather-process-output
                    #'eat--eshell-adjust-make-process-args)
-    (advice-remove #'eshell-resume-eval
-                   #'eat--eshell-set-input-process))))
+    (when (>= emacs-major-version 29)
+      (advice-remove #'eshell-resume-eval
+                     #'eat--eshell-set-input-process)))))
 
 
 ;;;; Eshell Visual Command Handling.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]