branch: elpa/aidermacs commit e4d8c2789202ec810d59cd4c4d5039473b4b7094 Author: Mingde (Matthew) Zeng <matthew...@posteo.net> Commit: Mingde (Matthew) Zeng <matthew...@posteo.net>
Cleanup residuals --- aidermacs-backend-vterm.el | 12 +++++++----- aidermacs-models.el | 2 -- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el index b7cb926ad1..cd2ad68d37 100644 --- a/aidermacs-backend-vterm.el +++ b/aidermacs-backend-vterm.el @@ -16,6 +16,10 @@ (defvar vterm-shell) (defvar vterm-buffer-name) +;; Forward declaration to avoid compiler warnings +(declare-function vterm--render "vterm") +(declare-function vterm--get-prompt-point "vterm") + (defun aidermacs--is-aidermacs-vterm-buffer-p (&optional buffer) "Check if BUFFER is an aidermacs vterm buffer. If BUFFER is nil, check the current buffer. @@ -32,9 +36,8 @@ pattern to match. If the finish sequence is detected, store the output via `aidermacs--store-output`, restore ORIG-FILTER, and return t." (when (buffer-live-p (process-buffer proc)) (with-current-buffer (process-buffer proc) - ;; Only render vterm if needed - this is expensive - (when (and (fboundp 'vterm--render) - (vterm--invalidate-p)) + ;; Render vterm if the function is available + (when (fboundp 'vterm--render) (condition-case nil (vterm--render) (error nil))) @@ -118,8 +121,7 @@ BUFFER-NAME is the name for the vterm buffer." "--light-mode")) (cmd (mapconcat 'identity (append (list program mode) args) " ")) (vterm-buffer-name buffer-name) - (vterm-shell cmd) - (vterm-shell-orig vterm-shell)) + (vterm-shell cmd)) (with-current-buffer (vterm-other-window) (advice-add 'vterm-send-return :around #'aidermacs--vterm-output-advice) ;; Set a reasonable scrollback limit to prevent memory issues diff --git a/aidermacs-models.el b/aidermacs-models.el index 2cb6d824ea..7d92e2eacb 100644 --- a/aidermacs-models.el +++ b/aidermacs-models.el @@ -97,7 +97,6 @@ API provider." (if (string= hostname "generativelanguage.googleapis.com") (concat url "/models?key=" token) (concat url "/models")))) - (goto-char url-http-end-of-headers) (let* ((json-object-type 'alist) (json-data (json-read)) (models (if (string= hostname "generativelanguage.googleapis.com") @@ -145,7 +144,6 @@ This fetches models from various API providers and caches them." ("https://api.anthropic.com/v1" . "ANTHROPIC_API_KEY") ("https://generativelanguage.googleapis.com/v1beta" . "GEMINI_API_KEY"))) (let ((url (car url-token-pair)) - (token-env (cdr url-token-pair)) (token-value (getenv (cdr url-token-pair)))) (when (and token-value (not (string-empty-p token-value))) (condition-case err