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.
This commit is contained in:
parent
974bdce47d
commit
69f7a83449
5 changed files with 5 additions and 9 deletions
|
@ -29,7 +29,6 @@
|
||||||
#:use-module (ice-9 popen)
|
#:use-module (ice-9 popen)
|
||||||
#:use-module (tekuti util)
|
#:use-module (tekuti util)
|
||||||
#:use-module (tekuti config)
|
#:use-module (tekuti config)
|
||||||
#:use-module (scheme kwargs)
|
|
||||||
#:use-module (tekuti match-bind)
|
#:use-module (tekuti match-bind)
|
||||||
#:use-module ((srfi srfi-1) #:select (filter-map partition
|
#:use-module ((srfi srfi-1) #:select (filter-map partition
|
||||||
delete-duplicates))
|
delete-duplicates))
|
||||||
|
@ -95,7 +94,7 @@
|
||||||
(output output)
|
(output output)
|
||||||
(status ret))))))))
|
(status ret))))))))
|
||||||
|
|
||||||
(define/kwargs (git* args (input #f) (env '()))
|
(define* (git* args #:key (input #f) (env '()))
|
||||||
(if input
|
(if input
|
||||||
(call-with-temp-file
|
(call-with-temp-file
|
||||||
input
|
input
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;; Tekuti
|
;; 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
|
;; This program is free software; you can redistribute it and/or
|
||||||
;; modify it under the terms of the GNU General Public License as
|
;; modify it under the terms of the GNU General Public License as
|
||||||
|
@ -34,7 +34,6 @@
|
||||||
#:use-module (tekuti url)
|
#:use-module (tekuti url)
|
||||||
#:use-module (tekuti request)
|
#:use-module (tekuti request)
|
||||||
#:use-module (srfi srfi-19)
|
#:use-module (srfi srfi-19)
|
||||||
#:use-module (scheme kwargs)
|
|
||||||
#:export (relurl rellink redirect post-url
|
#:export (relurl rellink redirect post-url
|
||||||
published-posts
|
published-posts
|
||||||
post-editing-form
|
post-editing-form
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;; Tekuti
|
;; 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
|
;; This program is free software; you can redistribute it and/or
|
||||||
;; modify it under the terms of the GNU General Public License as
|
;; modify it under the terms of the GNU General Public License as
|
||||||
|
@ -35,7 +35,6 @@
|
||||||
#:use-module (tekuti page-helpers)
|
#:use-module (tekuti page-helpers)
|
||||||
#:use-module (srfi srfi-34)
|
#:use-module (srfi srfi-34)
|
||||||
#:use-module (srfi srfi-19)
|
#:use-module (srfi srfi-19)
|
||||||
#:use-module (scheme kwargs)
|
|
||||||
#:export (page-admin
|
#:export (page-admin
|
||||||
page-admin-posts
|
page-admin-posts
|
||||||
page-admin-post
|
page-admin-post
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
(define-module (tekuti request)
|
(define-module (tekuti request)
|
||||||
#:use-module ((srfi srfi-1) #:select (find-tail fold))
|
#:use-module ((srfi srfi-1) #:select (find-tail fold))
|
||||||
#:use-module (scheme kwargs)
|
|
||||||
#:use-module (tekuti match-bind)
|
#:use-module (tekuti match-bind)
|
||||||
#:use-module (tekuti util)
|
#:use-module (tekuti util)
|
||||||
#:use-module (tekuti url)
|
#:use-module (tekuti url)
|
||||||
|
@ -109,7 +108,7 @@
|
||||||
request
|
request
|
||||||
(lp (rpush (car kv) (cadr kv) request) (cddr kv)))))
|
(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)))
|
(let ((pair (assq k request)))
|
||||||
(cond
|
(cond
|
||||||
(pair (cdr pair))
|
(pair (cdr pair))
|
||||||
|
|
|
@ -227,7 +227,7 @@
|
||||||
(read))
|
(read))
|
||||||
h))
|
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)
|
(make-date (date-nanosecond date) (date-second date)
|
||||||
(date-minute date) (date-minute date)
|
(date-minute date) (date-minute date)
|
||||||
(+ (date-day date) day) (+ (date-month date) month)
|
(+ (date-day date) day) (+ (date-month date) month)
|
||||||
|
|
Loading…
Reference in a new issue