Skip to content

Commit 3f5a6e1

Browse files
committed
refactor: Follow gptel's display rules for chat buffer
* mevedel-instructions.el (mevedel--ov-actions-show-answer): Use `gptel-display-buffer-action` when displaying the chat buffer. * mevedel.el (mevedel--process-directive): Ditto. * mevedel-tools.el (mevedel--prompt-user-with-overlay) (mevedel-tools--show-inline-preview) (mevedel-tools--return-to-inline-preview, mevedel-tools--ask-user): Use `display-buffer` instead of `pop-to-buffer` and follow `gptel-display-buffer-action`.
1 parent df6aaca commit 3f5a6e1

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

mevedel-instructions.el

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
;; `gptel' for @ref expansion support
1212
(declare-function gptel-fsm-info "ext:gptel-request" (fsm))
13+
(defvar gptel-display-buffer-action)
1314

1415
;; `mevedel'
1516
(declare-function mevedel--patch-buffer "mevedel" (&optional create))
@@ -1298,7 +1299,7 @@ reference the answer."
12981299
(interactive)
12991300
(let ((chat-buffer (mevedel--chat-buffer)))
13001301
(with-current-buffer chat-buffer
1301-
(display-buffer chat-buffer)
1302+
(display-buffer chat-buffer gptel-display-buffer-action)
13021303
(let* ((info (gptel-fsm-info gptel--fsm-last))
13031304
(response-start (plist-get info :position)))
13041305
(goto-char response-start)))))

mevedel-tools.el

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
;; `gptel'
2525
(defvar gptel--fsm-last)
2626
(defvar gptel--header-line-info)
27+
(defvar gptel-display-buffer-action)
2728
(defvar gptel-mode)
2829
(defvar gptel-use-header-line)
2930

@@ -593,7 +594,7 @@ using `recursive-edit' to block until the user responds."
593594
start (point) 'font-lock-face (gptel-agent--block-bg))))
594595

595596
;; Show the chat buffer and position cursor at the overlay
596-
(pop-to-buffer chat-buffer)
597+
(display-buffer chat-buffer gptel-display-buffer-action)
597598
(goto-char start)
598599
(recenter)
599600

@@ -1314,7 +1315,7 @@ Arguments:
13141315
;; Show the chat buffer and position cursor at the overlay
13151316
(with-current-buffer chat-buffer
13161317
(goto-char (overlay-start ov)))
1317-
(pop-to-buffer chat-buffer)))
1318+
(display-buffer chat-buffer gptel-display-buffer-action)))
13181319

13191320
(defun mevedel-tools--create-inline-preview-overlay (diff-string temp-file real-path
13201321
final-callback chat-buffer
@@ -1600,7 +1601,7 @@ Updates the inline preview with any changes made during the ediff session."
16001601
tool-name)
16011602

16021603
;; Show the chat buffer to the user
1603-
(pop-to-buffer chat-buffer)
1604+
(display-buffer chat-buffer gptel-display-buffer-action)
16041605
(goto-char overlay-start))
16051606

16061607
(setq mevedel-tools--current-inline-preview-overlay nil))))
@@ -2915,7 +2916,7 @@ QUESTIONS is an array of question plists, each with :question and :options keys.
29152916
(goto-char start)))
29162917

29172918
;; Show buffer
2918-
(pop-to-buffer chat-buffer)))
2919+
(display-buffer chat-buffer gptel-display-buffer-action)))
29192920

29202921
(submit-answers
29212922
()
@@ -2999,7 +3000,7 @@ QUESTIONS is an array of question plists, each with :question and :options keys.
29993000
(overlay-put overlay 'keymap keymap)
30003001
(goto-char start)))
30013002

3002-
(pop-to-buffer chat-buffer))
3003+
(display-buffer chat-buffer gptel-display-buffer-action))
30033004

30043005
(cleanup-and-return
30053006
(result)

mevedel.el

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
(require 'mevedel-system)
4242

4343
;; `gptel'
44+
(defvar gptel-display-buffer-action)
4445
(defvar gptel-prompt-transform-functions)
4546
(declare-function gptel-mode "ext:gptel")
4647

@@ -664,7 +665,7 @@ Updates directive status and overlay, handles success/failure states."
664665

665666
;; Display chat buffer if configured
666667
(when mevedel-show-chat-buffer
667-
(display-buffer chat-buffer))
668+
(display-buffer chat-buffer gptel-display-buffer-action))
668669

669670
;; Execute with gptel-request
670671
(with-current-buffer chat-buffer

0 commit comments

Comments
 (0)