branch: elpa/gptel
commit a33e1bb7cbd4a91894f28a66f9e28eb57dd5ea80
Author: Karthik Chikmagalur <[email protected]>
Commit: Karthik Chikmagalur <[email protected]>
gptel: Move gptel--strip-mode-suffix
Move `gptel--strip-mode-suffix' up the require chain to
gptel-request.el. With this change, the gptel-context feature no
longer depends on gptel, only gptel-request. This continues the
process of decoupling gptel's UI layer from the request layer.
* gptel-context.el: Require gptel-request, not gptel.
* gptel.el (gptel--strip-mode-suffix): Move it from here...
* gptel-request.el (gptel--strip-mode-suffix): ...to here.
---
gptel-context.el | 2 +-
gptel-request.el | 15 +++++++++++++++
gptel.el | 15 ---------------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/gptel-context.el b/gptel-context.el
index 6274c52b683..6756d76943f 100644
--- a/gptel-context.el
+++ b/gptel-context.el
@@ -27,7 +27,7 @@
;;; Code:
-(require 'gptel)
+(require 'gptel-request)
(require 'cl-lib)
(require 'project)
diff --git a/gptel-request.el b/gptel-request.el
index 955f1c09217..9a30a914822 100644
--- a/gptel-request.el
+++ b/gptel-request.el
@@ -899,6 +899,21 @@ Later plists in the sequence take precedence over earlier
ones."
(goto-char pm))
(insert "\n```\n"))
+(defun gptel--strip-mode-suffix (mode-sym)
+ "Remove the -mode suffix from MODE-SYM.
+
+MODE-SYM is typically a major-mode symbol."
+ (or (alist-get mode-sym gptel--mode-description-alist)
+ (let ((mode-name (thread-last
+ (symbol-name mode-sym)
+ (string-remove-suffix "-mode")
+ (string-remove-suffix "-ts"))))
+ ;; NOTE: The advertised calling convention of provided-mode-derived-p
+ ;; has changed in Emacs 30, this needs to be updated eventually
+ (if (provided-mode-derived-p
+ mode-sym 'prog-mode 'text-mode 'tex-mode)
+ mode-name ""))))
+
(defvar url-http-end-of-headers)
(defvar url-http-response-status)
(cl-defun gptel--url-retrieve (url &key method data headers)
diff --git a/gptel.el b/gptel.el
index 23ccda9b22c..d8bb33e2da6 100644
--- a/gptel.el
+++ b/gptel.el
@@ -526,21 +526,6 @@ Link failed to validate, see
`gptel-markdown-validate-link' or `gptel-org-valida
This is used when generating system prompts for rewriting and
when including context from these major modes.")
-(defun gptel--strip-mode-suffix (mode-sym)
- "Remove the -mode suffix from MODE-SYM.
-
-MODE-SYM is typically a major-mode symbol."
- (or (alist-get mode-sym gptel--mode-description-alist)
- (let ((mode-name (thread-last
- (symbol-name mode-sym)
- (string-remove-suffix "-mode")
- (string-remove-suffix "-ts"))))
- ;; NOTE: The advertised calling convention of provided-mode-derived-p
- ;; has changed in Emacs 30, this needs to be updated eventually
- (if (provided-mode-derived-p
- mode-sym 'prog-mode 'text-mode 'tex-mode)
- mode-name ""))))
-
;;; Saving and restoring state
