From 83ad2d6c7c00093e48465d08fa8e8c739abcf619 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Sat, 25 Nov 2023 11:32:28 +0100
Subject: [PATCH] update f

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---
 bba.org                                           |  1 +
 .../f-autoloads.el                                |  0
 .../{f-20230116.1032 => f-20230704.1346}/f-pkg.el |  6 ++++--
 .../f-shortdoc.el                                 |  0
 elpa/{f-20230116.1032 => f-20230704.1346}/f.el    | 15 +++++++++++----
 5 files changed, 16 insertions(+), 6 deletions(-)
 rename elpa/{f-20230116.1032 => f-20230704.1346}/f-autoloads.el (100%)
 rename elpa/{f-20230116.1032 => f-20230704.1346}/f-pkg.el (62%)
 rename elpa/{f-20230116.1032 => f-20230704.1346}/f-shortdoc.el (100%)
 rename elpa/{f-20230116.1032 => f-20230704.1346}/f.el (98%)

diff --git a/bba.org b/bba.org
index 15cd8484..d079aa0c 100644
--- a/bba.org
+++ b/bba.org
@@ -3580,6 +3580,7 @@ Amazon instance ID at point.
 [2022-12-09 Fri 18:09]
 
 #+begin_src emacs-lisp
+  (require 'f)
   (defvar bba-emacs-files (flatten-list
 			   `("bba-shell.org"
 			     "bba-orgmode.org"
diff --git a/elpa/f-20230116.1032/f-autoloads.el b/elpa/f-20230704.1346/f-autoloads.el
similarity index 100%
rename from elpa/f-20230116.1032/f-autoloads.el
rename to elpa/f-20230704.1346/f-autoloads.el
diff --git a/elpa/f-20230116.1032/f-pkg.el b/elpa/f-20230704.1346/f-pkg.el
similarity index 62%
rename from elpa/f-20230116.1032/f-pkg.el
rename to elpa/f-20230704.1346/f-pkg.el
index e2d3c604..c635d3df 100644
--- a/elpa/f-20230116.1032/f-pkg.el
+++ b/elpa/f-20230704.1346/f-pkg.el
@@ -1,9 +1,11 @@
-(define-package "f" "20230116.1032" "Modern API for working with files and directories"
+(define-package "f" "20230704.1346" "Modern API for working with files and directories"
   '((emacs "24.1")
     (s "1.7.0")
     (dash "2.2.0"))
-  :commit "8a70ba3002197e3c6421181492b60b37d4d4af7b" :authors
+  :commit "19e1da061e759b05e8c480b426287a063ca39484" :authors
   '(("Johan Andersson" . "johan.rejeep@gmail.com"))
+  :maintainers
+  '(("Lucien Cartier-Tilet" . "lucien@phundrak.com"))
   :maintainer
   '("Lucien Cartier-Tilet" . "lucien@phundrak.com")
   :keywords
diff --git a/elpa/f-20230116.1032/f-shortdoc.el b/elpa/f-20230704.1346/f-shortdoc.el
similarity index 100%
rename from elpa/f-20230116.1032/f-shortdoc.el
rename to elpa/f-20230704.1346/f-shortdoc.el
diff --git a/elpa/f-20230116.1032/f.el b/elpa/f-20230704.1346/f.el
similarity index 98%
rename from elpa/f-20230116.1032/f.el
rename to elpa/f-20230704.1346/f.el
index ab51853a..6984aee2 100644
--- a/elpa/f-20230116.1032/f.el
+++ b/elpa/f-20230704.1346/f.el
@@ -73,7 +73,7 @@ will discard all the preceeding arguments and make this absolute
 path the new root of the generated path."
   (let (path
         (relative (f-relative-p (car args))))
-    (-map
+    (mapc
      (lambda (arg)
        (setq path (cond ((not path) arg)
                         ((f-absolute-p arg)
@@ -454,8 +454,15 @@ The extension, in a file name, is the part that follows the last
 (defun f-descendant-of-p (path-a path-b)
   "Return t if PATH-A is desendant of PATH-B."
   (unless (f-same-p path-a path-b)
-    (string-prefix-p (f-full path-b)
-                     (f-full path-a))))
+    (let ((path-a (f-split (f-full path-a)))
+          (path-b (f-split (f-full path-b)))
+          (parent-p t))
+      (while (and path-b parent-p)
+        (if (string= (car path-a) (car path-b))
+            (setq path-a (cdr path-a)
+                  path-b (cdr path-b))
+          (setq parent-p nil)))
+      parent-p)))
 
 (defalias 'f-descendant-of? 'f-descendant-of-p)
 
@@ -691,7 +698,7 @@ For more info on METHOD, see `f--date-compare'."
             (member (f-filename file) '("." "..")))
           (directory-files path t))))
     (cond (recursive
-           (-map
+           (mapc
             (lambda (entry)
               (if (f-file-p entry)
                   (setq result (cons entry result))
-- 
2.47.3