From ed98a5bd6966489ec468c218a1df8fc174b3a842 Mon Sep 17 00:00:00 2001 From: Brit Butler Date: Thu, 20 Sep 2012 18:38:42 -0400 Subject: [PATCH] Fix destructuring and other minor thinkos. --- plugins/disqus.lisp | 5 +++-- src/config.lisp | 2 +- src/themes.lisp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/disqus.lisp b/plugins/disqus.lisp index 0d97219..418320e 100644 --- a/plugins/disqus.lisp +++ b/plugins/disqus.lisp @@ -1,7 +1,8 @@ (defpackage :coleslaw-disqus (:use :cl) (:export #:enable) - (:import-from :coleslaw #:add-injection)) + (:import-from :coleslaw #:add-injection + #:post)) (in-package :coleslaw-disqus) @@ -24,4 +25,4 @@ (defun enable (&key shortname) (add-injection (list (format nil *disqus-header* shortname) - (lambda (x) (typep x post))) :head)) + (lambda (x) (typep x 'post))) :body)) diff --git a/src/config.lisp b/src/config.lisp index cfb444d..c40c811 100644 --- a/src/config.lisp +++ b/src/config.lisp @@ -27,7 +27,7 @@ (defun load-plugins (plugins) "Compile and load the listed PLUGINS. It is expected that matching *.lisp files are in the plugins folder in coleslaw's source directory." - (flet ((plugin-path (name) + (flet ((plugin-path (sym) (app-path "plugins/~a" (string-downcase (symbol-name sym))))) (dolist (plugin plugins) (etypecase plugin diff --git a/src/themes.lisp b/src/themes.lisp index 92645f8..b7ca912 100644 --- a/src/themes.lisp +++ b/src/themes.lisp @@ -15,7 +15,7 @@ any return value other than nil indicates the injection should be added." (defun find-injections (content) (flet ((injections-for (location) - (loop for (injection . predicate) in (getf *injections* location) + (loop for (injection predicate) in (getf *injections* location) when (funcall predicate content) collect injection))) (list :head (injections-for :head)