From c6cf6ee943688f7f73a24b302259e94e211dc5bc Mon Sep 17 00:00:00 2001 From: "Colin M. Strickland" Date: Sat, 25 Oct 2014 22:15:30 +0100 Subject: [PATCH 1/3] exclude x64fsl files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4675d0a..3627a85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *~ *.fasl +*dx64fsl ignore/ generated/ .curr From bcd9051b146234aa582a60859229984e0f28397a Mon Sep 17 00:00:00 2001 From: "Colin M. Strickland" Date: Sat, 25 Oct 2014 22:16:29 +0100 Subject: [PATCH 2/3] use :utf8 symbol directly in external-format sbcl can use :utf8 as a direct symbol also --- src/config.lisp | 2 +- src/content.lisp | 2 +- src/util.lisp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.lisp b/src/config.lisp index d73a98a..f9d4ea0 100644 --- a/src/config.lisp +++ b/src/config.lisp @@ -68,7 +68,7 @@ doesn't exist, use the .coleslawrc in the home directory." (defun load-config (&optional (repo-dir "")) "Find and load the coleslaw configuration from .coleslawrc. REPO-DIR will be preferred over the home directory if provided." - (with-open-file (in (discover-config-path repo-dir) :external-format '(:utf-8)) + (with-open-file (in (discover-config-path repo-dir) :external-format :utf-8) (let ((config-form (read in))) (setf *config* (construct 'blog config-form) (repo *config*) repo-dir))) diff --git a/src/content.lisp b/src/content.lisp index 0774ead..a4bf94b 100644 --- a/src/content.lisp +++ b/src/content.lisp @@ -72,7 +72,7 @@ (file-position stream))))) (read-sequence seq stream) (remove #\Nul seq)))) - (with-open-file (in file :external-format '(:utf-8)) + (with-open-file (in file :external-format :utf-8) (let ((metadata (parse-metadata in)) (content (slurp-remainder in)) (filepath (enough-namestring file (repo *config*)))) diff --git a/src/util.lisp b/src/util.lisp index 1862ec3..8bcff07 100644 --- a/src/util.lisp +++ b/src/util.lisp @@ -88,7 +88,7 @@ along with any missing parent directories otherwise." :direction :output :if-exists :supersede :if-does-not-exist :create - :external-format '(:utf-8)) + :external-format :utf-8) (write text :stream out :escape nil))) (defun get-updated-files (&optional (revision *last-revision*)) From b38b07e83aa458227844940f295c5383caa2ab7a Mon Sep 17 00:00:00 2001 From: "Colin M. Strickland" Date: Sun, 26 Oct 2014 09:25:22 +0000 Subject: [PATCH 3/3] gitignore 32 and 64 bit ccl fasl files they have different file extensions --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3627a85..021dbdc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ *~ *.fasl -*dx64fsl +*.dx??fsl ignore/ generated/ .curr