branch: externals/beframe
commit bd2001dcc1a329b14daf0dcdd3a88fe6f9da5c17
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Do not try to rename frame if beframe-rename-function is nil
This was reported by Karthik Chikmagalur on the mailing list:
<https://lists.sr.ht/~protesilaos/general-issues/%3C87a5w8yi1n.fsf%40gmail.com%3E>.
---
beframe.el | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/beframe.el b/beframe.el
index 3852334e4f..7bddd3378e 100644
--- a/beframe.el
+++ b/beframe.el
@@ -551,14 +551,14 @@ Also see the `beframe-prefix-map'."
(progn
(setq beframe--read-buffer-function read-buffer-function
read-buffer-function #'beframe-read-buffer)
- (add-hook 'after-make-frame-functions beframe-rename-function)
(add-hook 'after-make-frame-functions #'beframe-frame-predicate)
+ (add-hook 'after-make-frame-functions #'beframe-maybe-rename-frame)
(add-hook 'after-make-frame-functions #'beframe-create-scratch-buffer)
(beframe--functions-in-frames))
(setq read-buffer-function beframe--read-buffer-function
beframe--read-buffer-function nil)
- (remove-hook 'after-make-frame-functions beframe-rename-function)
(remove-hook 'after-make-frame-functions #'beframe-frame-predicate)
+ (remove-hook 'after-make-frame-functions #'beframe-maybe-rename-frame)
(remove-hook 'after-make-frame-functions #'beframe-create-scratch-buffer)
(beframe--functions-in-frames :disable)))
@@ -650,6 +650,13 @@ Remember that this function doubles as an example for
frame
(list (cons 'name (beframe--infer-frame-name frame name)))))
+(defun beframe-maybe-rename-frame (frame &optional name)
+ "Helper function to determine if `beframe-rename-function' is called.
+FRAME and optional NAME arguments are passed to the
+`beframe-rename-function'."
+ (when beframe-rename-function
+ (funcall beframe-rename-function frame name)))
+
(defun beframe--frame-buffer-p (buf &optional frame)
"Return non-nil if BUF belongs to the current frame.
Use optional FRAME to test if BUF belongs to it."
