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

gptel: rear-nonsticky text-property by default

Browse source 
* gptel.el (gptel--insert-response, gptel--restore-state): Don't
set the rear-nonsticky property on the gptel response text.
Instead, the gptel text-property is globally declared to be
nonsticky via `text-property-default-nonsticky`.

This change is since markdown-mode makes rear-nonsticky a
font-lock-managed property and we can't set it manually.  Setting
this property explicitly also makes all text properties in the
range nonsticky, which can have unintended side effects.

* gptel-curl.el (gptel-curl--stream-insert-response): Ditto.
This commit is contained in:
Karthik Chikmagalur 2024-03-08 19:09:48 -08:00
parent b634f05fe5
commit 5e9e36d854
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gptel-curl.el
View file

@ -270,9 +270,8 @@ See `gptel--url-get-response' for details."
(when transformer (when transformer
(setq response (funcall transformer response))) (setq response (funcall transformer response)))
(add-text-properties (put-text-property
0 (length response) '(gptel response rear-nonsticky t) 0 (length response) 'gptel 'response response)
response)
(goto-char tracking-marker) (goto-char tracking-marker)
;; (run-hooks 'gptel-pre-stream-hook) ;; (run-hooks 'gptel-pre-stream-hook)
(insert response) (insert response)

13
gptel.el
View file

@ -656,8 +656,7 @@ for when gptel restores chat metadata."
(progn (progn
(when-let ((bounds (org-entry-get (point-min) "GPTEL_BOUNDS"))) (when-let ((bounds (org-entry-get (point-min) "GPTEL_BOUNDS")))
(mapc (pcase-lambda (`(,beg . ,end)) (mapc (pcase-lambda (`(,beg . ,end))
(add-text-properties (put-text-property beg end 'gptel 'response))
beg end '(gptel response rear-nonsticky t)))
(read bounds)) (read bounds))
(message "gptel chat restored.")) (message "gptel chat restored."))
(when-let ((model (org-entry-get (point-min) "GPTEL_MODEL"))) (when-let ((model (org-entry-get (point-min) "GPTEL_MODEL")))
@ -729,6 +728,9 @@ file."
;; Minor mode and UI ;; Minor mode and UI
;; NOTE: It's not clear that this is the best strategy:
(add-to-list 'text-property-default-nonsticky '(gptel . t))
;;;###autoload ;;;###autoload
(define-minor-mode gptel-mode (define-minor-mode gptel-mode
"Minor mode for interacting with LLMs." "Minor mode for interacting with LLMs."
@ -984,9 +986,8 @@ See `gptel--url-get-response' for details."
(setq response (gptel--transform-response (setq response (gptel--transform-response
response gptel-buffer)) response gptel-buffer))
(save-excursion (save-excursion
(add-text-properties (put-text-property
0 (length response) '(gptel response rear-nonsticky t) 0 (length response) 'gptel 'response response)
response)
(with-current-buffer (marker-buffer start-marker) (with-current-buffer (marker-buffer start-marker)
(goto-char start-marker) (goto-char start-marker)
(run-hooks 'gptel-pre-response-hook) (run-hooks 'gptel-pre-response-hook)
@ -1486,7 +1487,7 @@ context for the ediff session."
(nbutlast history)))) (nbutlast history))))
(add-text-properties (add-text-properties
0 (length alt-response) 0 (length alt-response)
`(gptel response rear-nonsticky t gptel-history ,history) `(gptel response gptel-history ,history)
alt-response) alt-response)
(setq offset (min (- (point) beg) (1- (length alt-response)))) (setq offset (min (- (point) beg) (1- (length alt-response))))
(delete-region beg end) (delete-region beg end)