emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/beframe af8ef10149: Make beframe-infer-frame-name not c


From: ELPA Syncer
Subject: [elpa] externals/beframe af8ef10149: Make beframe-infer-frame-name not choke on non-project directory
Date: Wed, 31 Jul 2024 03:57:27 -0400 (EDT)

branch: externals/beframe
commit af8ef1014912f6c2b3569ac22eba81a7fa62462f
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Make beframe-infer-frame-name not choke on non-project directory
    
    Thanks to duli for pointing this out and suggesting a solution. This
    was done in issue 5: <https://github.com/protesilaos/beframe/issues/5>.
---
 README.org |  2 +-
 beframe.el | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/README.org b/README.org
index 05a046f495..cae0aeb6ae 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, Valentino.
+  Chikmagalur, Valentino, duli.
 
 * COPYING
 :PROPERTIES:
diff --git a/beframe.el b/beframe.el
index 230960b98b..0e807262de 100644
--- a/beframe.el
+++ b/beframe.el
@@ -619,25 +619,25 @@ 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'."
-  (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)
-     ((and projectp buf-name)
-      (format "%s" (file-name-nondirectory (directory-file-name dir))))
-     ((and (not (minibufferp)) file-name)
-      (format "%s %s" buf-name dir))
-     ((not (minibufferp))
-      buf-name)
-     (t
-      dir))))
+  (when (frame-list)
+    (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))))
+      (cond
+       ((and name (stringp name))
+        name)
+       ((and projectp buf-name)
+        (format "%s" (file-name-nondirectory (directory-file-name dir))))
+       ((and (not (minibufferp)) file-name)
+        (format "%s %s" buf-name dir))
+       ((not (minibufferp))
+        buf-name)
+       (t
+        dir)))))
 
 ;;;###autoload
 (defun beframe-rename-frame (frame &optional name)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]