branch: externals/beframe
commit 60593ffc1edd7d467cb22aee39f1d3fb778b45fb
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Do not try to rename if there is no frame
This is relevant for the initial frame when the daemon is already
running.
Thanks to Valentino for reporting the bug in issue 3:
<https://github.com/protesilaos/beframe/issues/3>.
---
README.org | 2 +-
beframe.el | 15 ++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/README.org b/README.org
index c569f15ec0..05a046f495 100644
--- a/README.org
+++ b/README.org
@@ -404,7 +404,7 @@ matters.
+ Contributions to code or the manual :: Edgar Vincent, Tony Zorman.
+ Ideas and/or user feedback :: Derek Passen, Karan Ahlawat, Karthik
- Chikmagalur.
+ Chikmagalur, Valentino.
* COPYING
:PROPERTIES:
diff --git a/beframe.el b/beframe.el
index d33f8444a9..f1c5ebc361 100644
--- a/beframe.el
+++ b/beframe.el
@@ -618,13 +618,14 @@ Also see the variable `beframe-prefix-map'."
(defun beframe-infer-frame-name (frame name)
"Infer a suitable name for FRAME with given NAME.
See `beframe-rename-frame'."
- (let* ((buffer (car (frame-parameter frame 'buffer-list)))
- (file-name (when (bufferp buffer) (buffer-file-name buffer)))
- (buf-name (buffer-name buffer))
- (dir (with-current-buffer buffer (or (vc-root-dir)
default-directory)))
- (projectp (and (bound-and-true-p project--list)
- (listp project--list)
- (member (list dir) project--list))))
+ (when-let (((frame-list))
+ (buffer (car (frame-parameter frame 'buffer-list)))
+ (file-name (when (bufferp buffer) (buffer-file-name buffer)))
+ (buf-name (buffer-name buffer))
+ (dir (with-current-buffer buffer (or (vc-root-dir)
default-directory)))
+ (projectp (and (bound-and-true-p project--list)
+ (listp project--list)
+ (member (list dir) project--list))))
(cond
((and name (stringp name))
name)
