tristan/gptel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gptel: Don't use called-interactively-p

Browse source 
* gptel.el (gptel): Switch from the fragile
`called-interactively-p` to using the interactive form to check if
`gptel` is called interactively.
This commit is contained in:
Karthik Chikmagalur 2023-12-22 16:48:01 -08:00
parent 2e92c0303c
commit 8d3e08faa8
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gptel.el
View file

@ -1052,7 +1052,7 @@ See `gptel-curl--get-response' for its contents.")
"Could not parse HTTP response."))))) "Could not parse HTTP response.")))))
;;;###autoload ;;;###autoload
(defun gptel (name &optional _ initial) (defun gptel (name &optional _ initial interactivep)
"Switch to or start ChatGPT session with NAME. "Switch to or start ChatGPT session with NAME.
With a prefix arg, query for a (new) session name. With a prefix arg, query for a (new) session name.
@ -1060,7 +1060,9 @@ With a prefix arg, query for a (new) session name.
Ask for API-KEY if `gptel-api-key' is unset. Ask for API-KEY if `gptel-api-key' is unset.
If region is active, use it as the INITIAL prompt. Returns the If region is active, use it as the INITIAL prompt. Returns the
buffer created or switched to." buffer created or switched to.
INTERACTIVEP is t when gptel is called interactively."
(interactive (list (if current-prefix-arg (interactive (list (if current-prefix-arg
(read-string "Session name: " (generate-new-buffer-name gptel-default-session)) (read-string "Session name: " (generate-new-buffer-name gptel-default-session))
gptel-default-session) gptel-default-session)
@ -1075,9 +1077,8 @@ buffer created or switched to."
(gptel-backend-name backend))))))) (gptel-backend-name backend)))))))
(and (use-region-p) (and (use-region-p)
(buffer-substring (region-beginning) (buffer-substring (region-beginning)
(region-end))))) (region-end)))
;; (unless api-key t))
;; (user-error "No API key available"))
(with-current-buffer (get-buffer-create name) (with-current-buffer (get-buffer-create name)
(cond ;Set major mode (cond ;Set major mode
((eq major-mode gptel-default-mode)) ((eq major-mode gptel-default-mode))
@ -1089,7 +1090,7 @@ buffer created or switched to."
(goto-char (point-max)) (goto-char (point-max))
(skip-chars-backward "\t\r\n") (skip-chars-backward "\t\r\n")
(if (bobp) (insert (or initial (gptel-prompt-prefix-string)))) (if (bobp) (insert (or initial (gptel-prompt-prefix-string))))
(when (called-interactively-p 'gptel) (when interactivep
(pop-to-buffer (current-buffer)) (pop-to-buffer (current-buffer))
(message "Send your query with %s!" (message "Send your query with %s!"
(substitute-command-keys "\\[gptel-send]"))) (substitute-command-keys "\\[gptel-send]")))