branch: elpa/aidermacs
commit 254a802d62629ea4d8165f1d39967ba7e987c2e7
Author: Mingde (Matthew) Zeng <matthew...@posteo.net>
Commit: Mingde (Matthew) Zeng <matthew...@posteo.net>
Revert "add options to groups"
This reverts commit 3fd69ed34e71f583fb26cdfe31722dc5c7d7fc98.
---
aidermacs-backend-comint.el | 6 ++----
aidermacs-backend-vterm.el | 9 +++------
aidermacs-backends.el | 9 +++------
aidermacs-models.el | 15 +++++----------
aidermacs.el | 27 +++++++++------------------
5 files changed, 22 insertions(+), 44 deletions(-)
diff --git a/aidermacs-backend-comint.el b/aidermacs-backend-comint.el
index a91838def2..d891d04e7f 100644
--- a/aidermacs-backend-comint.el
+++ b/aidermacs-backend-comint.el
@@ -48,8 +48,7 @@
("cpp" . "c++"))
"Map external language names to Emacs names."
:type '(alist :key-type (string :tag "Language Name/Alias")
- :value-type (string :tag "Mode Name (without -mode)"))
- :group 'aidermacs-backend-comint)
+ :value-type (string :tag "Mode Name (without -mode)")))
;; FIXME: Hmm... seems to use standard diff3 markers. Maybe some code
;; in `smerge-mode.el' could be (re)used?
@@ -63,8 +62,7 @@
(defcustom aidermacs-comint-multiline-newline-key "S-<return>"
"Key binding for `comint-accumulate' in Aidermacs buffers.
This allows for multi-line input without sending the command."
- :type 'string
- :group 'aidermacs-backend-comint)
+ :type 'string)
(defface aidermacs-command-separator
'((((type graphic)) :strike-through t :extend t)
diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el
index e6fe70aa4f..6bc591a955 100644
--- a/aidermacs-backend-vterm.el
+++ b/aidermacs-backend-vterm.el
@@ -69,8 +69,7 @@
(defcustom aidermacs-vterm-multiline-newline-key "S-<return>"
"Key binding to enter a newline without sending in vterm."
- :type 'string
- :group 'aidermacs-backend-vterm)
+ :type 'string)
(defun aidermacs--vterm-check-finish-sequence-repeated (proc orig-filter
start-point)
"Check for the finish sequence in PROC's buffer.
@@ -159,8 +158,7 @@ Use BUFFER if provided, otherwise retrieve it from
`aidermacs-get-buffer-name'."
(defcustom aidermacs-vterm-use-theme-colors t
"Whether to use Emacs theme colors for aider.
Has effect only when using the vterm backend."
- :type 'boolean
- :group 'aidermacs-backend-vterm)
+ :type 'boolean)
(defcustom aidermacs-vterm-theme-colors-plist
'("--user-input-color" font-lock-function-name-face
@@ -170,8 +168,7 @@ Has effect only when using the vterm backend."
"Emacs faces to use for aider colour flags.
Keys are the commandline arguments to send to aider.
Values are either faces or strings (colours like \"#00cc00\")."
- :type 'plist
- :group 'aidermacs-backend-vterm)
+ :type 'plist)
(defun aidermacs--vterm-colorname-to-rgb (name)
"Convert Emacs color NAME to RGB values."
diff --git a/aidermacs-backends.el b/aidermacs-backends.el
index 3e39870173..9f37f4da0d 100644
--- a/aidermacs-backends.el
+++ b/aidermacs-backends.el
@@ -42,13 +42,11 @@ Options are `comint' (the default) or `vterm'. When set to
`vterm',
aidermacs launches a fully functional vterm buffer instead
of using a comint process."
:type '(choice (const :tag "Comint" comint)
- (const :tag "VTerm" vterm))
- :group 'aidermacs-backends)
+ (const :tag "VTerm" vterm)))
(defcustom aidermacs-output-limit 10
"Maximum number of output entries to keep in history."
- :type 'integer
- :group 'aidermacs-backends)
+ :type 'integer)
(defvar-local aidermacs--output-history nil
"List to store aidermacs output history.
@@ -62,8 +60,7 @@ Each entry is a cons cell (timestamp . output-text).")
(defcustom aidermacs-before-run-backend-hook nil
"Hook run before the aidermacs backend is startd."
- :type 'hook
- :group 'aidermacs-backends)
+ :type 'hook)
(defun aidermacs-get-output-history (&optional limit)
"Get the output history, optionally limited to LIMIT entries.
diff --git a/aidermacs-models.el b/aidermacs-models.el
index b04039084f..60f4db8305 100644
--- a/aidermacs-models.el
+++ b/aidermacs-models.el
@@ -38,24 +38,20 @@
(defcustom aidermacs-default-model "sonnet"
"Default AI model to use for aidermacs sessions when not in Architect mode."
- :type 'string
- :group 'aidermacs-models)
+ :type 'string)
(defcustom aidermacs-architect-model "sonnet"
"Default AI model to use for architectural reasoning in aidermacs sessions."
- :type 'string
- :group 'aidermacs-models)
+ :type 'string)
(defcustom aidermacs-editor-model aidermacs-default-model
"Default AI model to use for code editing in aidermacs sessions.
Defaults to `aidermacs-default-model` if not explicitly set."
- :type 'string
- :group 'aidermacs-models)
+ :type 'string)
(defcustom aidermacs-use-architect-mode nil
"If non-nil, use separate Architect/Editor mode."
- :type 'boolean
- :group 'aidermacs-models)
+ :type 'boolean)
(defcustom aidermacs-popular-models
'("sonnet"
@@ -66,8 +62,7 @@ Defaults to `aidermacs-default-model` if not explicitly set."
"List of available AI models for selection.
Each model should be in the format expected by the aidermacs CLI.
Also based on aidermacs LLM benchmark:
https://aidermacs.chat/docs/leaderboards/";
- :type '(repeat string)
- :group 'aidermacs-models)
+ :type '(repeat string))
(defvar aidermacs--cached-models aidermacs-popular-models
"Cache of available AI models.")
diff --git a/aidermacs.el b/aidermacs.el
index b2509342c9..cbcd75dffd 100644
--- a/aidermacs.el
+++ b/aidermacs.el
@@ -53,13 +53,11 @@ Possible values: `code', `ask', `architect', `help'.")
(defcustom aidermacs-show-diff-after-change t
"When non-nil, enable ediff for reviewing AI-generated changes.
When nil, skip preparing temp buffers and showing ediff comparisons."
- :type 'boolean
- :group 'aidermacs)
+ :type 'boolean)
(defcustom aidermacs-program "aider"
"The name or path of the aidermacs program."
- :type 'string
- :group 'aidermacs)
+ :type 'string)
(define-obsolete-variable-alias 'aidermacs-args 'aidermacs-extra-args "0.5.0"
"Old name for `aidermacs-extra-args', please update your config.")
@@ -69,31 +67,26 @@ When nil, skip preparing temp buffers and showing ediff
comparisons."
When set, Aidermacs will pass this to aider via --config flag,
ignoring other configuration settings except `aidermacs-extra-args'."
:type '(choice (const :tag "None" nil)
- (file :tag "Config file"))
- :group 'aidermacs)
+ (file :tag "Config file")))
(defcustom aidermacs-extra-args '()
"Additional arguments to pass to the aidermacs command."
- :type '(repeat string)
- :group 'aidermacs)
+ :type '(repeat string))
(defcustom aidermacs-subtree-only nil
"When non-nil, run aider with --subtree-only in the current directory.
This is useful for working in monorepos where you want to limit aider's scope."
- :type 'boolean
- :group 'aidermacs)
+ :type 'boolean)
(defcustom aidermacs-auto-commits nil
"When non-nil, enable auto-commits of LLM changes.
When nil, disable auto-commits requiring manual git commits."
- :type 'boolean
- :group 'aidermacs)
+ :type 'boolean)
(defcustom aidermacs-auto-accept-architect nil
"When non-nil, automatically accept architect mode changes.
When nil, require explicit confirmation before applying changes."
- :type 'boolean
- :group 'aidermacs)
+ :type 'boolean)
(defun aidermacs-project-root ()
"Get the project root using project.el, VC, or fallback to file directory.
@@ -108,8 +101,7 @@ This function tries multiple methods to determine the
project root."
(defcustom aidermacs-prompt-file-name ".aider.prompt.org"
"File name that will automatically enable `aidermacs-minor-mode' when opened.
This is the file name without path."
- :type 'string
- :group 'aidermacs)
+ :type 'string)
(defconst aidermacs-prompt-regexp "^[^[:space:]<]*>[[:space:]]+$"
"Regexp to match Aider's command prompt.")
@@ -1166,8 +1158,7 @@ Provides these keybindings:
".aider.input.history")
"List of filenames that should automatically enable `aidermacs-minor-mode'.
These are exact filename matches (including the dot prefix)."
- :type '(repeat string)
- :group 'aidermacs)
+ :type '(repeat string))
(defun aidermacs--maybe-enable-minor-mode ()
"Determines whether to enable `aidermacs-minor-mode'."
