factor-lang: Remove unused patches
parent
d8c58b12e5
commit
8f1dfb16f4
|
@ -1,33 +0,0 @@
|
|||
From 812d79ccfa1d702afc12561aa8c05a9b4a158620 Mon Sep 17 00:00:00 2001
|
||||
From: timor <timor.dd@googlemail.com>
|
||||
Date: Thu, 7 Mar 2019 13:49:41 +0100
|
||||
Subject: [PATCH] pathnames: redirect "work" prefix to ~/.local/share/factor
|
||||
|
||||
---
|
||||
core/io/pathnames/pathnames.factor | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor
|
||||
index d1aed3ad82..6104a0c94b 100644
|
||||
--- a/core/io/pathnames/pathnames.factor
|
||||
+++ b/core/io/pathnames/pathnames.factor
|
||||
@@ -136,7 +136,8 @@ HOOK: resolve-symlinks os ( path -- path' )
|
||||
M: object resolve-symlinks normalize-path ;
|
||||
|
||||
: resource-path ( path -- newpath )
|
||||
- "resource-path" get prepend-path ;
|
||||
+ dup "work" = [ drop "work/" ] when
|
||||
+ "work/" ?head [ "~/.local/share/factor" ] [ "resource-path" get ] if prepend-path ;
|
||||
|
||||
HOOK: home io-backend ( -- dir )
|
||||
|
||||
@@ -219,4 +220,4 @@ C: <pathname> pathname
|
||||
|
||||
M: pathname absolute-path string>> absolute-path ;
|
||||
|
||||
-M: pathname <=> [ string>> ] compare ;
|
||||
\ No newline at end of file
|
||||
+M: pathname <=> [ string>> ] compare ;
|
||||
--
|
||||
2.18.1
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From da8a4b9c1094a568f443c525ca1ce11f686be1bc Mon Sep 17 00:00:00 2001
|
||||
From: timor <timor.dd@googlemail.com>
|
||||
Date: Thu, 8 Aug 2019 14:13:09 +0200
|
||||
Subject: [PATCH] adjust unit test for finding executables in path for NixOS
|
||||
|
||||
---
|
||||
basis/io/standard-paths/unix/unix-tests.factor | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/basis/io/standard-paths/unix/unix-tests.factor b/basis/io/standard-paths/unix/unix-tests.factor
|
||||
index 986c0564d2..f0772fdcc9 100644
|
||||
--- a/basis/io/standard-paths/unix/unix-tests.factor
|
||||
+++ b/basis/io/standard-paths/unix/unix-tests.factor
|
||||
@@ -5,12 +5,12 @@ sequences tools.test ;
|
||||
|
||||
{ f } [ "" find-in-path ] unit-test
|
||||
{ t } [
|
||||
- "ls" find-in-path { "/bin/ls" "/usr/bin/ls" } member?
|
||||
+ "ls" find-in-path not not
|
||||
] unit-test
|
||||
|
||||
{ t } [
|
||||
"/sbin:" "PATH" os-env append "PATH" [
|
||||
"ps" find-in-path
|
||||
- { "/bin/ps" "/sbin/ps" "/usr/bin/ps" } member?
|
||||
+ not not
|
||||
] with-os-env
|
||||
] unit-test
|
||||
--
|
||||
2.19.2
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
diff --git a/misc/fuel/fuel-debug.el b/misc/fuel/fuel-debug.el
|
||||
index 7f9dc3ea41..0ee277ede8 100644
|
||||
--- a/misc/fuel/fuel-debug.el
|
||||
+++ b/misc/fuel/fuel-debug.el
|
||||
@@ -308,20 +308,21 @@ the debugger."
|
||||
|
||||
(defun fuel-debug--replace-usings (file uses)
|
||||
(pop-to-buffer (find-file-noselect file))
|
||||
- (goto-char (point-min))
|
||||
- (if (re-search-forward "^USING: " nil t)
|
||||
- (let ((begin (point))
|
||||
- (end (or (and (re-search-forward ";\\( \\|$\\)") (point))
|
||||
- (point))))
|
||||
- (kill-region begin end))
|
||||
- (re-search-forward "^IN: " nil t)
|
||||
- (beginning-of-line)
|
||||
- (open-line 2)
|
||||
- (insert "USING: "))
|
||||
- (let ((start (point))
|
||||
- (tokens (append uses '(";"))))
|
||||
- (insert (mapconcat 'substring-no-properties tokens " "))
|
||||
- (fill-region start (point) nil)))
|
||||
+ (save-excursion
|
||||
+ (goto-char (point-min))
|
||||
+ (if (re-search-forward "^USING: " nil t)
|
||||
+ (let ((begin (point))
|
||||
+ (end (or (and (re-search-forward ";\\( \\|$\\)") (point))
|
||||
+ (point))))
|
||||
+ (kill-region begin end))
|
||||
+ (re-search-forward "^IN: " nil t)
|
||||
+ (beginning-of-line)
|
||||
+ (open-line 2)
|
||||
+ (insert "USING: "))
|
||||
+ (let ((start (point))
|
||||
+ (tokens (append uses '(";"))))
|
||||
+ (insert (mapconcat 'substring-no-properties tokens " "))
|
||||
+ (fill-region start (point) nil))))
|
||||
|
||||
(defun fuel-debug-update-usings ()
|
||||
(interactive)
|
Loading…
Reference in New Issue