diff options
| author |  Andy Wingo | 2010-10-14 13:04:05 +0200 |
|---|---|---|
| committer | Andy Wingo | 2010-11-13 18:47:03 +0100 |
| commit | 69f7a8344967612759dc19404d71de9a831c8207 (patch) | |
| tree | 5330d08beb1a50cc1121922ea00ce5e8c3e1bff9 | |
| parent | 974bdce47d8a9ccc26217f8ddd0f2fbf595843b6 (diff) | |
| download | tekuti-69f7a8344967612759dc19404d71de9a831c8207.tar.gz tekuti-69f7a8344967612759dc19404d71de9a831c8207.zip | |
change uses of define/kwargs to define*
* tekuti/git.scm (git*):
* tekuti/request.scm (rref):
* tekuti/util.scm (date-increment): Use define* instead of
define/kwargs. Remove (scheme kwargs) import.
* tekuti/page-helpers.scm (tekuti):
* tekuti/page.scm (tekuti): Remove needless (scheme kwargs) imports.
| -rw-r--r-- | tekuti/git.scm | 3 | ||||
| -rw-r--r-- | tekuti/page-helpers.scm | 3 | ||||
| -rw-r--r-- | tekuti/page.scm | 3 | ||||
| -rw-r--r-- | tekuti/request.scm | 3 | ||||
| -rw-r--r-- | tekuti/util.scm | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/tekuti/git.scm b/tekuti/git.scm index f6b18b5..aac6a6e 100644 --- a/tekuti/git.scm +++ b/tekuti/git.scm @@ -29,7 +29,6 @@ #:use-module (ice-9 popen) #:use-module (tekuti util) #:use-module (tekuti config) - #:use-module (scheme kwargs) #:use-module (tekuti match-bind) #:use-module ((srfi srfi-1) #:select (filter-map partition delete-duplicates)) @@ -95,7 +94,7 @@ (output output) (status ret)))))))) -(define/kwargs (git* args (input #f) (env '())) +(define* (git* args #:key (input #f) (env '())) (if input (call-with-temp-file input diff --git a/tekuti/page-helpers.scm b/tekuti/page-helpers.scm index 3a04d3f..b2f9ace 100644 --- a/tekuti/page-helpers.scm +++ b/tekuti/page-helpers.scm @@ -1,5 +1,5 @@ ;; Tekuti -;; Copyright (C) 2008 Andy Wingo <wingo at pobox dot com> +;; Copyright (C) 2008, 2010 Andy Wingo <wingo at pobox dot com> ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -34,7 +34,6 @@ #:use-module (tekuti url) #:use-module (tekuti request) #:use-module (srfi srfi-19) - #:use-module (scheme kwargs) #:export (relurl rellink redirect post-url published-posts post-editing-form diff --git a/tekuti/page.scm b/tekuti/page.scm index f114715..29cedb8 100644 --- a/tekuti/page.scm +++ b/tekuti/page.scm @@ -1,5 +1,5 @@ ;; Tekuti -;; Copyright (C) 2008 Andy Wingo <wingo at pobox dot com> +;; Copyright (C) 2008, 2010 Andy Wingo <wingo at pobox dot com> ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -35,7 +35,6 @@ #:use-module (tekuti page-helpers) #:use-module (srfi srfi-34) #:use-module (srfi srfi-19) - #:use-module (scheme kwargs) #:export (page-admin page-admin-posts page-admin-post diff --git a/tekuti/request.scm b/tekuti/request.scm index 3cba561..f82d22c 100644 --- a/tekuti/request.scm +++ b/tekuti/request.scm @@ -26,7 +26,6 @@ (define-module (tekuti request) #:use-module ((srfi srfi-1) #:select (find-tail fold)) - #:use-module (scheme kwargs) #:use-module (tekuti match-bind) #:use-module (tekuti util) #:use-module (tekuti url) @@ -109,7 +108,7 @@ request (lp (rpush (car kv) (cadr kv) request) (cddr kv))))) -(define/kwargs (rref request k (default #f) (default-proc #f)) +(define* (rref request k #:optional (default #f) #:key (default-proc #f)) (let ((pair (assq k request))) (cond (pair (cdr pair)) diff --git a/tekuti/util.scm b/tekuti/util.scm index 6482ade..f30f732 100644 --- a/tekuti/util.scm +++ b/tekuti/util.scm @@ -227,7 +227,7 @@ (read)) h)) -(define/kwargs (date-increment date (day 0) (month 0) (year 0)) +(define* (date-increment date #:key (day 0) (month 0) (year 0)) (make-date (date-nanosecond date) (date-second date) (date-minute date) (date-minute date) (+ (date-day date) day) (+ (date-month date) month) |