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

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

[nongnu] elpa/pacmacs a3b2a5ce44 216/472: Replace pacmacs--file-content


From: ELPA Syncer
Subject: [nongnu] elpa/pacmacs a3b2a5ce44 216/472: Replace pacmacs--file-content with f-read-text (#122)
Date: Thu, 6 Jan 2022 21:59:26 -0500 (EST)

branch: elpa/pacmacs
commit a3b2a5ce449ecd5fdf6f4fab10a02e89a4cc3dad
Author: rexim <reximkut@gmail.com>
Commit: rexim <reximkut@gmail.com>

    Replace pacmacs--file-content with f-read-text (#122)
---
 pacmacs-score.el           | 3 ++-
 pacmacs-utils.el           | 5 -----
 pacmacs.el                 | 3 ++-
 test/pacmacs-utils-test.el | 5 -----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pacmacs-score.el b/pacmacs-score.el
index 64c6e25f3e..75256cfb5f 100644
--- a/pacmacs-score.el
+++ b/pacmacs-score.el
@@ -32,6 +32,7 @@
 
 ;;; Code:
 
+(require 'f)
 (require 'dash)
 (require 'dash-functional)
 
@@ -53,7 +54,7 @@
 (defun pacmacs--read-score-table ()
   (when (file-exists-p pacmacs--score-file-name)
     (-> pacmacs--score-file-name
-        (pacmacs--file-content)
+        (f-read-text)
         (read-from-string)
         (car))))
 
diff --git a/pacmacs-utils.el b/pacmacs-utils.el
index f4f603d9ac..eccf32542f 100644
--- a/pacmacs-utils.el
+++ b/pacmacs-utils.el
@@ -72,11 +72,6 @@ side-effects."
     (cdr (assoc direction-vector
                 direction-table))))
 
-(defun pacmacs--file-content (filename)
-  (with-temp-buffer
-    (insert-file-contents filename)
-    (buffer-string)))
-
 (defun pacmacs--levelname-from-filename (filename)
   (when (string-match "\\(map[0-9]+\\)\\.txt" filename)
     (match-string 1 filename)))
diff --git a/pacmacs.el b/pacmacs.el
index 701ded9857..9d6b3f4cb4 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -38,6 +38,7 @@
 
 (require 'cl-lib)
 (require 'dash)
+(require 'f)
 
 (require 'pacmacs-anim)
 (require 'pacmacs-board)
@@ -508,7 +509,7 @@
   (let* ((lines (split-string (->> map-name
                                    (format "./maps/%s.txt")
                                    (pacmacs--find-resource-file)
-                                   (pacmacs--file-content))
+                                   (f-read-text))
                               "\n" t))
          (board-width (apply 'max (mapcar #'length lines)))
          (board-height (length lines)))
diff --git a/test/pacmacs-utils-test.el b/test/pacmacs-utils-test.el
index d323b4ff4c..168dfbaa76 100644
--- a/test/pacmacs-utils-test.el
+++ b/test/pacmacs-utils-test.el
@@ -10,8 +10,3 @@
   (should (equal "map06" (pacmacs--levelname-from-filename "map06.txt")))
   (should (not (pacmacs--levelname-from-filename "."))))
 
-(ert-deftest pacmacs--file-content-test ()
-  (with-mock
-   (should (equal "hello\n"
-                  (pacmacs--file-content
-                   "test-data/file-with-hello-string.txt")))))



reply via email to

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