From d38abcea5db49e0354e7bebb5050ee736bfa4fa6 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 28 May 2024 17:54:08 +0200 Subject: [PATCH] update vterm and eshell-vterm Signed-off-by: Andreas Gerler --- .../eshell-vterm-autoloads.el | 0 .../eshell-vterm-pkg.el | 4 +- .../eshell-vterm.el | 4 +- .../CMakeLists.txt | 0 .../elisp.c | 0 .../elisp.h | 0 .../emacs-module.h | 0 .../etc/emacs-vterm-bash.sh | 0 .../etc/emacs-vterm-zsh.sh | 0 .../etc/emacs-vterm.fish | 0 .../utf8.c | 0 .../utf8.h | 0 .../vterm-autoloads.el | 39 +++++++++---------- .../vterm-module.c | 2 +- .../vterm-module.h | 2 + .../vterm-pkg.el | 4 +- .../vterm.el | 2 +- 17 files changed, 29 insertions(+), 28 deletions(-) rename elpa/{eshell-vterm-20221229.1328 => eshell-vterm-20240305.1149}/eshell-vterm-autoloads.el (100%) rename elpa/{eshell-vterm-20221229.1328 => eshell-vterm-20240305.1149}/eshell-vterm-pkg.el (77%) rename elpa/{eshell-vterm-20221229.1328 => eshell-vterm-20240305.1149}/eshell-vterm.el (96%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/CMakeLists.txt (100%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/elisp.c (100%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/elisp.h (100%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/emacs-module.h (100%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/etc/emacs-vterm-bash.sh (100%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/etc/emacs-vterm-zsh.sh (100%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/etc/emacs-vterm.fish (100%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/utf8.c (100%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/utf8.h (100%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/vterm-autoloads.el (79%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/vterm-module.c (99%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/vterm-module.h (99%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/vterm-pkg.el (70%) rename elpa/{vterm-20240102.1640 => vterm-20240520.231}/vterm.el (99%) diff --git a/elpa/eshell-vterm-20221229.1328/eshell-vterm-autoloads.el b/elpa/eshell-vterm-20240305.1149/eshell-vterm-autoloads.el similarity index 100% rename from elpa/eshell-vterm-20221229.1328/eshell-vterm-autoloads.el rename to elpa/eshell-vterm-20240305.1149/eshell-vterm-autoloads.el diff --git a/elpa/eshell-vterm-20221229.1328/eshell-vterm-pkg.el b/elpa/eshell-vterm-20240305.1149/eshell-vterm-pkg.el similarity index 77% rename from elpa/eshell-vterm-20221229.1328/eshell-vterm-pkg.el rename to elpa/eshell-vterm-20240305.1149/eshell-vterm-pkg.el index 11c89496..57ce1758 100644 --- a/elpa/eshell-vterm-20221229.1328/eshell-vterm-pkg.el +++ b/elpa/eshell-vterm-20240305.1149/eshell-vterm-pkg.el @@ -1,7 +1,7 @@ -(define-package "eshell-vterm" "20221229.1328" "Vterm for visual commands in eshell" +(define-package "eshell-vterm" "20240305.1149" "Vterm for visual commands in eshell" '((emacs "27.1") (vterm "0.0.1")) - :commit "e96c30ad5e7d63b778fc3232e81b090b63b13277" :authors + :commit "20f4b246fa605a1533cdfbe3cb7faf31a24e3d2e" :authors '(("Illia Ostapyshyn" . "ilya.ostapyshyn@gmail.com")) :maintainers '(("Illia Ostapyshyn" . "ilya.ostapyshyn@gmail.com")) diff --git a/elpa/eshell-vterm-20221229.1328/eshell-vterm.el b/elpa/eshell-vterm-20240305.1149/eshell-vterm.el similarity index 96% rename from elpa/eshell-vterm-20221229.1328/eshell-vterm.el rename to elpa/eshell-vterm-20240305.1149/eshell-vterm.el index 0fd622e9..e693cc0e 100644 --- a/elpa/eshell-vterm-20221229.1328/eshell-vterm.el +++ b/elpa/eshell-vterm-20240305.1149/eshell-vterm.el @@ -56,7 +56,9 @@ allowed. In case ARGS is nil, a new VTerm session is created." " " args))) (save-current-buffer (switch-to-buffer term-buf) - (vterm-mode) + (cl-letf (((symbol-function 'vterm--get-shell) + (lambda () vterm-shell))) + (vterm-mode)) (setq-local eshell-parent-buffer eshell-buf) (let ((proc (get-buffer-process term-buf))) (if (and proc (eq 'run (process-status proc))) diff --git a/elpa/vterm-20240102.1640/CMakeLists.txt b/elpa/vterm-20240520.231/CMakeLists.txt similarity index 100% rename from elpa/vterm-20240102.1640/CMakeLists.txt rename to elpa/vterm-20240520.231/CMakeLists.txt diff --git a/elpa/vterm-20240102.1640/elisp.c b/elpa/vterm-20240520.231/elisp.c similarity index 100% rename from elpa/vterm-20240102.1640/elisp.c rename to elpa/vterm-20240520.231/elisp.c diff --git a/elpa/vterm-20240102.1640/elisp.h b/elpa/vterm-20240520.231/elisp.h similarity index 100% rename from elpa/vterm-20240102.1640/elisp.h rename to elpa/vterm-20240520.231/elisp.h diff --git a/elpa/vterm-20240102.1640/emacs-module.h b/elpa/vterm-20240520.231/emacs-module.h similarity index 100% rename from elpa/vterm-20240102.1640/emacs-module.h rename to elpa/vterm-20240520.231/emacs-module.h diff --git a/elpa/vterm-20240102.1640/etc/emacs-vterm-bash.sh b/elpa/vterm-20240520.231/etc/emacs-vterm-bash.sh similarity index 100% rename from elpa/vterm-20240102.1640/etc/emacs-vterm-bash.sh rename to elpa/vterm-20240520.231/etc/emacs-vterm-bash.sh diff --git a/elpa/vterm-20240102.1640/etc/emacs-vterm-zsh.sh b/elpa/vterm-20240520.231/etc/emacs-vterm-zsh.sh similarity index 100% rename from elpa/vterm-20240102.1640/etc/emacs-vterm-zsh.sh rename to elpa/vterm-20240520.231/etc/emacs-vterm-zsh.sh diff --git a/elpa/vterm-20240102.1640/etc/emacs-vterm.fish b/elpa/vterm-20240520.231/etc/emacs-vterm.fish similarity index 100% rename from elpa/vterm-20240102.1640/etc/emacs-vterm.fish rename to elpa/vterm-20240520.231/etc/emacs-vterm.fish diff --git a/elpa/vterm-20240102.1640/utf8.c b/elpa/vterm-20240520.231/utf8.c similarity index 100% rename from elpa/vterm-20240102.1640/utf8.c rename to elpa/vterm-20240520.231/utf8.c diff --git a/elpa/vterm-20240102.1640/utf8.h b/elpa/vterm-20240520.231/utf8.h similarity index 100% rename from elpa/vterm-20240102.1640/utf8.h rename to elpa/vterm-20240520.231/utf8.h diff --git a/elpa/vterm-20240102.1640/vterm-autoloads.el b/elpa/vterm-20240520.231/vterm-autoloads.el similarity index 79% rename from elpa/vterm-20240102.1640/vterm-autoloads.el rename to elpa/vterm-20240520.231/vterm-autoloads.el index 26a35211..fe69da20 100644 --- a/elpa/vterm-20240102.1640/vterm-autoloads.el +++ b/elpa/vterm-20240520.231/vterm-autoloads.el @@ -1,17 +1,18 @@ -;;; vterm-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; vterm-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "vterm" "vterm.el" (0 0 0 0)) ;;; Generated autoloads from vterm.el (autoload 'vterm-module-compile "vterm" "\ -Compile vterm-module." t nil) - +Compile vterm-module." t) (autoload 'vterm--bookmark-handler "vterm" "\ Handler to restore a vterm bookmark BMK. @@ -19,8 +20,7 @@ If a vterm buffer of the same name does not exist, the function will create a new vterm buffer of the name. It also checks the current directory and sets it to the bookmarked directory if needed. -\(fn BMK)" nil nil) - +(fn BMK)") (autoload 'vterm-next-error-function "vterm" "\ Advance to the next error message and visit the file where the error was. This is the value of `next-error-function' in Compilation @@ -29,8 +29,7 @@ forwards (or backwards, if negative). Optional argument RESET clears all the errors. -\(fn N &optional RESET)" t nil) - +(fn N &optional RESET)" t) (autoload 'vterm "vterm" "\ Create an interactive Vterm buffer. Start a new Vterm session, or switch to an already active @@ -47,8 +46,7 @@ already exist. The buffer name used for Vterm sessions is determined by the value of `vterm-buffer-name'. -\(fn &optional ARG)" t nil) - +(fn &optional ARG)" t) (autoload 'vterm-other-window "vterm" "\ Create an interactive Vterm buffer in another window. Start a new Vterm session, or switch to an already active @@ -65,20 +63,19 @@ already exist. The buffer name used for Vterm sessions is determined by the value of `vterm-buffer-name'. -\(fn &optional ARG)" t nil) - +(fn &optional ARG)" t) (register-definition-prefixes "vterm" '("vterm-")) - -;;;*** -;;;### (autoloads nil nil ("vterm-pkg.el") (0 0 0 0)) +;;; End of scraped data + +(provide 'vterm-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; vterm-autoloads.el ends here diff --git a/elpa/vterm-20240102.1640/vterm-module.c b/elpa/vterm-20240520.231/vterm-module.c similarity index 99% rename from elpa/vterm-20240102.1640/vterm-module.c rename to elpa/vterm-20240520.231/vterm-module.c index f6ab477d..05f40f0a 100644 --- a/elpa/vterm-20240102.1640/vterm-module.c +++ b/elpa/vterm-20240520.231/vterm-module.c @@ -1535,7 +1535,7 @@ int emacs_module_init(struct emacs_runtime *ert) { "Get the working directory of at line n.", NULL); bind_function(env, "vterm--get-pwd-raw", fun); fun = env->make_function(env, 1, 1, Fvterm_reset_cursor_point, - "Reset cursor postion.", NULL); + "Reset cursor position.", NULL); bind_function(env, "vterm--reset-point", fun); fun = env->make_function(env, 1, 1, Fvterm_get_icrnl, diff --git a/elpa/vterm-20240102.1640/vterm-module.h b/elpa/vterm-20240520.231/vterm-module.h similarity index 99% rename from elpa/vterm-20240102.1640/vterm-module.h rename to elpa/vterm-20240520.231/vterm-module.h index 1699cbc9..ebf36249 100644 --- a/elpa/vterm-20240102.1640/vterm-module.h +++ b/elpa/vterm-20240520.231/vterm-module.h @@ -23,7 +23,9 @@ VTERM_EXPORT int plugin_is_GPL_compatible; +#ifndef SB_MAX #define SB_MAX 100000 // Maximum 'scrollback' value. +#endif #ifndef MIN #define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) diff --git a/elpa/vterm-20240102.1640/vterm-pkg.el b/elpa/vterm-20240520.231/vterm-pkg.el similarity index 70% rename from elpa/vterm-20240102.1640/vterm-pkg.el rename to elpa/vterm-20240520.231/vterm-pkg.el index b7de2dfd..c64fcbf4 100644 --- a/elpa/vterm-20240102.1640/vterm-pkg.el +++ b/elpa/vterm-20240520.231/vterm-pkg.el @@ -1,6 +1,6 @@ -(define-package "vterm" "20240102.1640" "Fully-featured terminal emulator" +(define-package "vterm" "20240520.231" "Fully-featured terminal emulator" '((emacs "25.1")) - :commit "e96c53f5035c841b20937b65142498bd8e161a40" :authors + :commit "df057b1af2bb89a1deb288086f13be296af42090" :authors '(("Lukas Fürmetz" . "fuermetz@mailbox.org")) :maintainers '(("Lukas Fürmetz" . "fuermetz@mailbox.org")) diff --git a/elpa/vterm-20240102.1640/vterm.el b/elpa/vterm-20240520.231/vterm.el similarity index 99% rename from elpa/vterm-20240102.1640/vterm.el rename to elpa/vterm-20240520.231/vterm.el index ebb5b2a0..04c90587 100644 --- a/elpa/vterm-20240102.1640/vterm.el +++ b/elpa/vterm-20240520.231/vterm.el @@ -751,7 +751,7 @@ Exceptions are defined by `vterm-keymap-exceptions'." (inhibit-eol-conversion nil) (coding-system-for-read 'binary) (process-adaptive-read-buffering nil) - (width (max (- (window-body-width) (vterm--get-margin-width)) + (width (max (- (window-max-chars-per-line) (vterm--get-margin-width)) vterm-min-window-width))) (setq vterm--term (vterm--new (window-body-height) width vterm-max-scrollback -- 2.47.3