Merge pull request #62 from cmstrickland/ccl-fixes

A couple of tiny ccl fixes, external-format and gitgnore for ccl fsl files.
This commit is contained in:
Brit Butler 2014-10-26 09:51:25 -04:00
commit 7cd51a1334
4 changed files with 4 additions and 3 deletions

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
*~ *~
*.fasl *.fasl
*.dx??fsl
ignore/ ignore/
generated/ generated/
.curr .curr

View file

@ -68,7 +68,7 @@ doesn't exist, use the .coleslawrc in the home directory."
(defun load-config (&optional (repo-dir "")) (defun load-config (&optional (repo-dir ""))
"Find and load the coleslaw configuration from .coleslawrc. REPO-DIR will be "Find and load the coleslaw configuration from .coleslawrc. REPO-DIR will be
preferred over the home directory if provided." 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))) (let ((config-form (read in)))
(setf *config* (construct 'blog config-form) (setf *config* (construct 'blog config-form)
(repo *config*) repo-dir))) (repo *config*) repo-dir)))

View file

@ -72,7 +72,7 @@
(file-position stream))))) (file-position stream)))))
(read-sequence seq stream) (read-sequence seq stream)
(remove #\Nul seq)))) (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)) (let ((metadata (parse-metadata in))
(content (slurp-remainder in)) (content (slurp-remainder in))
(filepath (enough-namestring file (repo *config*)))) (filepath (enough-namestring file (repo *config*))))

View file

@ -88,7 +88,7 @@ along with any missing parent directories otherwise."
:direction :output :direction :output
:if-exists :supersede :if-exists :supersede
:if-does-not-exist :create :if-does-not-exist :create
:external-format '(:utf-8)) :external-format :utf-8)
(write text :stream out :escape nil))) (write text :stream out :escape nil)))
(defun get-updated-files (&optional (revision *last-revision*)) (defun get-updated-files (&optional (revision *last-revision*))