Luj/eat-emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compatibility issues with Emacs 28

Browse source 
* eat.el: Require 'subr-x'.
* eat.el (eat-yank, eat-yank-pop): Pass three arguments to
'mapconcat'.
* eat.el (eat--eshell-term-name): New function.
* eat.el (eat-eshell-mode): Use 'eat--eshell-term-name' instead
of using 'eat-term-name' directly.
* eat.el (eat-eshell-mode) [(< emacs-major-version 29)]: Use
'eshell-last-async-proc' instead of 'eshell-last-async-procs'.
* eat.el (eat--eshell-adjust-make-process-args)
[(< emacs-major-version 29)]: Don't check and set ':filter' and
':sentinel' of 'make-process' argument plist.  Set process
filter and sentinel from 'eshell-exec-hook'.
* eat.el (eat--eshell-adjust-make-process-args): Call
'eat--eshell-setup-proc-and-term' from 'eshell-exec-hook', not
just after 'make-process'.
This commit is contained in:
Akib Azmain Turja 2022-11-30 12:29:05 +06:00
parent d8171b9a8c
commit 0cf617d60e
No known key found for this signature in database
GPG key ID: 5535FCF54D88616B
1 changed files with 43 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
eat.el
View file

@ -77,6 +77,7 @@
;;; Code: ;;; Code:
(require 'subr-x)
(require 'cl-lib) (require 'cl-lib)
(require 'ansi-color) (require 'ansi-color)
(require 'shell) (require 'shell)
@ -5259,7 +5260,7 @@ ARG is passed to `yank', which see."
(if (stringp arg) (if (stringp arg)
arg arg
(string arg))) (string arg)))
args))))) args "")))))
(apply insert-for-yank args))))) (apply insert-for-yank args)))))
(yank arg)))) (yank arg))))
@ -5282,7 +5283,7 @@ ARG is passed to `yank-pop', which see."
(if (stringp arg) (if (stringp arg)
arg arg
(string arg))) (string arg)))
args))))) args "")))))
(apply insert-for-yank args))))) (apply insert-for-yank args)))))
(yank-pop arg)))) (yank-pop arg))))
@ -5973,6 +5974,10 @@ PROGRAM can be a shell command."
(defvar eshell-last-output-start) ; In `esh-mode'. (defvar eshell-last-output-start) ; In `esh-mode'.
(defvar eshell-last-output-end) ; In `esh-mode'. (defvar eshell-last-output-end) ; In `esh-mode'.
(defun eat--eshell-term-name (&rest _)
"Return the value of `TERM' environment variable for Eshell."
(eat-term-name))
(defun eat--eshell-output-filter () (defun eat--eshell-output-filter ()
"Handle output from subprocess." "Handle output from subprocess."
(let ((inhibit-quit t) ; Don't disturb! (let ((inhibit-quit t) ; Don't disturb!
@ -6110,18 +6115,24 @@ modify its argument to change the filter, the sentinel and invoke
((symbol-function #'make-process) ((symbol-function #'make-process)
(lambda (&rest plist) (lambda (&rest plist)
;; Make sure we don't attack wrong process. ;; Make sure we don't attack wrong process.
(if (not (and (eq (plist-get plist :filter) (if (not (and (equal (plist-get plist :command)
#'eshell-output-filter)
(eq (plist-get plist :sentinel)
#'eshell-sentinel)
(equal (plist-get plist :command)
(cons (file-local-name (cons (file-local-name
(expand-file-name command)) (expand-file-name command))
args)))) args))
;; Eshell on Emacs 28 uses
;; `start-file-process', so `:filter' and
;; `:sentinel' are nil now.
(or (< emacs-major-version 29)
(and (eq (plist-get plist :filter)
#'eshell-output-filter)
(eq (plist-get plist :sentinel)
#'eshell-sentinel)))))
(apply make-process plist) (apply make-process plist)
(setf (plist-get plist :filter) #'eat--eshell-filter (unless (< emacs-major-version 29)
(plist-get plist :sentinel) #'eat--eshell-sentinel (setf (plist-get plist :filter) #'eat--eshell-filter
(plist-get plist :command) (plist-get plist :sentinel)
#'eat--eshell-sentinel))
(setf (plist-get plist :command)
`("/usr/bin/env" "sh" "-c" `("/usr/bin/env" "sh" "-c"
,(format "stty -nl echo rows %d columns %d \ ,(format "stty -nl echo rows %d columns %d \
sane 2>%s ; if [ $1 = .. ]; then shift; fi; exec \"$@\"" sane 2>%s ; if [ $1 = .. ]; then shift; fi; exec \"$@\""
@ -6129,10 +6140,18 @@ sane 2>%s ; if [ $1 = .. ]; then shift; fi; exec \"$@\""
(window-max-chars-per-line) null-device) (window-max-chars-per-line) null-device)
".." ".."
,@(plist-get plist :command))) ,@(plist-get plist :command)))
(let ((process (apply make-process plist))) (apply make-process plist)))))
(eat--eshell-setup-proc-and-term process) (let ((hook
process))))) (lambda (proc)
(funcall fn command args))) (when (< emacs-major-version 29)
(set-process-filter proc #'eat--eshell-filter)
(set-process-sentinel proc #'eat--eshell-sentinel))
(eat--eshell-setup-proc-and-term proc))))
(unwind-protect
(progn
(add-hook 'eshell-exec-hook hook 99)
(funcall fn command args))
(remove-hook 'eshell-exec-hook hook)))))
;;;;; Minor Modes. ;;;;; Minor Modes.
@ -6194,6 +6213,7 @@ sane 2>%s ; if [ $1 = .. ]; then shift; fi; exec \"$@\""
(declare-function eshell-gather-process-output "esh-proc" (declare-function eshell-gather-process-output "esh-proc"
(command args)) (command args))
(defvar eshell-variable-aliases-list) ; In `esh-var'. (defvar eshell-variable-aliases-list) ; In `esh-var'.
(defvar eshell-last-async-proc) ; In `esh-cmd'.
(defvar eshell-last-async-procs) ; In `esh-cmd'. (defvar eshell-last-async-procs) ; In `esh-cmd'.
;;;###autoload ;;;###autoload
@ -6262,7 +6282,9 @@ sane 2>%s ; if [ $1 = .. ]; then shift; fi; exec \"$@\""
(dolist (buffer (buffer-list)) (dolist (buffer (buffer-list))
(with-current-buffer buffer (with-current-buffer buffer
(when (eq major-mode #'eshell-mode) (when (eq major-mode #'eshell-mode)
(when eshell-last-async-procs (when (if (< emacs-major-version 29)
(bound-and-true-p eshell-last-async-proc)
(bound-and-true-p eshell-last-async-procs))
(user-error (user-error
(concat "Can't toggle Eat Eshell mode while" (concat "Can't toggle Eat Eshell mode while"
" any Eshell process is running"))) " any Eshell process is running")))
@ -6273,7 +6295,7 @@ sane 2>%s ; if [ $1 = .. ]; then shift; fi; exec \"$@\""
(eat--eshell-local-mode +1)))) (eat--eshell-local-mode +1))))
(add-hook 'eshell-mode-hook #'eat--eshell-local-mode) (add-hook 'eshell-mode-hook #'eat--eshell-local-mode)
(setq eshell-variable-aliases-list (setq eshell-variable-aliases-list
`(("TERM" eat-term-name t t) `(("TERM" eat--eshell-term-name t)
("TERMINFO" eat-term-terminfo-directory t) ("TERMINFO" eat-term-terminfo-directory t)
("INSIDE_EMACS" eat-term-inside-emacs t) ("INSIDE_EMACS" eat-term-inside-emacs t)
,@eshell-variable-aliases-list)) ,@eshell-variable-aliases-list))
@ -6286,7 +6308,9 @@ sane 2>%s ; if [ $1 = .. ]; then shift; fi; exec \"$@\""
(with-current-buffer buffer (with-current-buffer buffer
(when (and (eq major-mode #'eshell-mode) (when (and (eq major-mode #'eshell-mode)
eat--eshell-local-mode) eat--eshell-local-mode)
(when eshell-last-async-procs (when (if (< emacs-major-version 29)
(bound-and-true-p eshell-last-async-proc)
(bound-and-true-p eshell-last-async-procs))
(user-error (user-error
(concat "Can't toggle Eat Eshell mode while" (concat "Can't toggle Eat Eshell mode while"
" any Eshell process is running"))) " any Eshell process is running")))
@ -6300,7 +6324,7 @@ sane 2>%s ; if [ $1 = .. ]; then shift; fi; exec \"$@\""
(cl-delete-if (cl-delete-if
(lambda (elem) (lambda (elem)
(member elem (member elem
'(("TERM" eat-term-name t t) '(("TERM" eat--eshell-term-name t)
("TERMINFO" eat-term-terminfo-directory t) ("TERMINFO" eat-term-terminfo-directory t)
("INSIDE_EMACS" eat-term-inside-emacs t)))) ("INSIDE_EMACS" eat-term-inside-emacs t))))
eshell-variable-aliases-list)) eshell-variable-aliases-list))