Skip to content

Commit 97b9923

Browse files
authored
refactor code using eaf-get-buffer (#862)
1 parent 1134fb1 commit 97b9923

File tree

2 files changed

+12
-19
lines changed

2 files changed

+12
-19
lines changed

core/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ def translate_text(text):
284284
def input_message(buffer_id, message, callback_tag, input_type, input_content):
285285
eval_in_emacs('eaf--input-message', [buffer_id, message, callback_tag, input_type, input_content])
286286

287-
def focus_emacs_buffer(message):
288-
eval_in_emacs('eaf-focus-buffer', [message])
287+
def focus_emacs_buffer(buffer_id):
288+
eval_in_emacs('eaf-focus-buffer', [buffer_id])
289289

290290
def atomic_edit(buffer_id, focus_text):
291291
eval_in_emacs('eaf--atomic-edit', [buffer_id, focus_text])

eaf.el

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,16 +1081,6 @@ of `eaf--buffer-app-name' inside the EAF buffer."
10811081
(symbol-name command)
10821082
`(quote ,command))))
10831083

1084-
(defun eaf-focus-buffer (focus-buffer-id)
1085-
"Focus the buffer given the FOCUS-BUFFER-ID."
1086-
(catch 'found-eaf
1087-
(eaf-for-each-eaf-buffer
1088-
(when (string= eaf--buffer-id focus-buffer-id)
1089-
(let ((buffer-window (get-buffer-window buffer 'visible)))
1090-
(when buffer-window
1091-
(select-window buffer-window)))
1092-
(throw 'found-eaf t)))))
1093-
10941084
(defun eaf-get-buffer (buffer-id)
10951085
"Find the buffer given the BUFFER-ID."
10961086
(catch 'found-eaf
@@ -1099,6 +1089,12 @@ of `eaf--buffer-app-name' inside the EAF buffer."
10991089
(throw 'found-eaf buffer))
11001090
nil)))
11011091

1092+
(defun eaf-focus-buffer (buffer-id)
1093+
"Focus the buffer given the BUFFER-ID."
1094+
(let* ((buffer (eaf-get-buffer buffer-id))
1095+
(window (if buffer (get-buffer-window buffer 'visible) nil)))
1096+
(when window (select-window window) t)))
1097+
11021098
(defun eaf--show-message (format-string)
11031099
"A wrapper around `message' that prepend [EAF/app-name] before FORMAT-STRING."
11041100
(let ((fmt (if eaf--buffer-app-name
@@ -1123,13 +1119,10 @@ and does not log to the *Message* buffer."
11231119
"Set Lisp variable NAME with VALUE on the Emacs side."
11241120
(set (intern name) value))
11251121

1126-
(defun eaf-request-kill-buffer (kill-buffer-id)
1127-
"Function for requesting to kill the given buffer with KILL-BUFFER-ID."
1128-
(catch 'found-eaf
1129-
(eaf-for-each-eaf-buffer
1130-
(when (string= eaf--buffer-id kill-buffer-id)
1131-
(kill-buffer buffer)
1132-
(throw 'found-eaf t)))))
1122+
(defun eaf-request-kill-buffer (buffer-id)
1123+
"Function for requesting to kill the given buffer with BUFFER-ID."
1124+
(let* ((buffer (eaf-get-buffer buffer-id)))
1125+
(when buffer (kill-buffer buffer) t)))
11331126

11341127
(defun eaf--first-start (eaf-epc-port)
11351128
"Call `eaf--open-internal' upon receiving `start_finish' signal from server.

0 commit comments

Comments
 (0)