Parcourir la Source

Merge pull request #62 from cmstrickland/ccl-fixes

A couple of tiny ccl fixes, external-format and gitgnore for ccl fsl files.
Brit Butler il y a 10 ans
Parent
commit
7cd51a1334
4 fichiers modifiés avec 4 ajouts et 3 suppressions
  1. 1 0
      .gitignore
  2. 1 1
      src/config.lisp
  3. 1 1
      src/content.lisp
  4. 1 1
      src/util.lisp

+ 1 - 0
.gitignore

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

+ 1 - 1
src/config.lisp

@@ -68,7 +68,7 @@ doesn't exist, use the .coleslawrc in the home directory."
68 68
 (defun load-config (&optional (repo-dir ""))
69 69
   "Find and load the coleslaw configuration from .coleslawrc. REPO-DIR will be
70 70
 preferred over the home directory if provided."
71
-  (with-open-file (in (discover-config-path repo-dir) :external-format '(:utf-8))
71
+  (with-open-file (in (discover-config-path repo-dir) :external-format :utf-8)
72 72
     (let ((config-form (read in)))
73 73
       (setf *config* (construct 'blog config-form)
74 74
             (repo *config*) repo-dir)))

+ 1 - 1
src/content.lisp

@@ -72,7 +72,7 @@
72 72
                                       (file-position stream)))))
73 73
              (read-sequence seq stream)
74 74
              (remove #\Nul seq))))
75
-    (with-open-file (in file :external-format '(:utf-8))
75
+    (with-open-file (in file :external-format :utf-8)
76 76
       (let ((metadata (parse-metadata in))
77 77
             (content (slurp-remainder in))
78 78
             (filepath (enough-namestring file (repo *config*))))

+ 1 - 1
src/util.lisp

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