[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")))))
- [nongnu] elpa/pacmacs cd50cff10c 448/472: Disable cursor for score table (#203), (continued)
- [nongnu] elpa/pacmacs cd50cff10c 448/472: Disable cursor for score table (#203), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs ee83af998d 467/472: Replace deprecated dash-functional dependency, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 31853e0341 166/472: Update README, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 13f24ef937 171/472: Implement pause. Close #112, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs cf693bef1c 173/472: UTs for pacmacs--levelname-from-filename function, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 239e27b0f2 178/472: Update README.md, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs d128a6f057 183/472: Enable lexical binding, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 9f9a514129 165/472: Add MELPA badge. Close #93, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 02c5a40cd3 193/472: Rename cell get/set as wrapped operations (#105), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs bddb837ffd 200/472: Rename object vars according to convension (#126), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs a3b2a5ce44 216/472: Replace pacmacs--file-content with f-read-text (#122),
ELPA Syncer <=
- [nongnu] elpa/pacmacs 8f9b38b16e 233/472: Revert all the refactoring in the scope of #81, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 52fec0d180 241/472: Normalize wall generating bits (#131), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs e06beacb11 242/472: Assign wall tiles on load map (#131), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 9e7685b818 248/472: Drop XBM support for wall tiles (#141), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 5ec5ce8e67 267/472: Remove that pacmacs--object-at-p already!, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs c571f5874c 272/472: Extract wall bits normalization, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 9a9ecb6679 283/472: Implement direction switching callbacks (#153), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs e710f00f69 295/472: Remove pacmacs--unterrify-all-ghosts (#153), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs e1ae35d526 316/472: Minimal version of 24.4 as the package requirement, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 73fcaa8a91 324/472: Remove pacmacs--vector+ (#159), ELPA Syncer, 2022/01/06