From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Pirotte Newsgroups: gmane.lisp.guile.devel Subject: guile-gnome, master: fix unless macro definition for guile prior to guile-2 only Date: Fri, 2 May 2014 16:14:51 -0300 Message-ID: <20140502161451.33c2c8b3@capac> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/IrJctxixHWzjc2SSI3jHCpo" X-Trace: ger.gmane.org 1399058179 31060 80.91.229.3 (2 May 2014 19:16:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 2 May 2014 19:16:19 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Fri May 02 21:16:12 2014 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WgIvY-0007AT-9a for guile-devel@m.gmane.org; Fri, 02 May 2014 21:15:20 +0200 Original-Received: from localhost ([::1]:45932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIvX-0007tg-O1 for guile-devel@m.gmane.org; Fri, 02 May 2014 15:15:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIvO-0007tW-AC for guile-devel@gnu.org; Fri, 02 May 2014 15:15:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgIvG-00081g-3n for guile-devel@gnu.org; Fri, 02 May 2014 15:15:10 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:56999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIvF-000811-Tk for guile-devel@gnu.org; Fri, 02 May 2014 15:15:02 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id 5F7C5A04C0C9 for ; Fri, 2 May 2014 21:15:01 +0200 (CEST) Original-Received: from maximusconfessor.all2all.org ([192.168.0.1]) by localhost (maximusconfessor.all2all.org [192.168.0.2]) (amavisd-new, port 10024) with ESMTP id JmyQS3UvN99c for ; Fri, 2 May 2014 20:56:37 +0200 (CEST) Original-Received: from capac (unknown [189.60.2.251]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id E9AF3A04C0B5 for ; Fri, 2 May 2014 21:14:53 +0200 (CEST) X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 79.99.200.102 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:17129 Archived-At: --MP_/IrJctxixHWzjc2SSI3jHCpo Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello, guile-gnome master: fix unless macro definition for guile prior to guile-2 only Patch review solicited. Thanks, David --MP_/IrJctxixHWzjc2SSI3jHCpo Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-fix-unless-macro-definition-for-guile-prior-to-guile.patch >From 910343bf6793d512979af851b504b83b06a10ed2 Mon Sep 17 00:00:00 2001 From: David PIROTTE Date: Fri, 2 May 2014 16:01:30 -0300 Subject: [PATCH 2/2] fix unless macro definition for guile prior to guile-2 only * glib/gnome/gobject/utils.scm: moving the unless macro definition in the conditonal expansion section for guile prior to guile-2. --- glib/gnome/gobject/utils.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/glib/gnome/gobject/utils.scm b/glib/gnome/gobject/utils.scm index fd88c8f..7a36bbb 100644 --- a/glib/gnome/gobject/utils.scm +++ b/glib/gnome/gobject/utils.scm @@ -35,7 +35,7 @@ re-export-modules define-macro-with-docs define-with-docs define-generic-with-docs define-class-with-docs - unless with-accessors)) + with-accessors)) ;;; ;;; {Miscellaneous} @@ -54,7 +54,10 @@ (define-macro (define-macro-with-docs form docs . body) `(begin (define-macro ,form ,@body) - (set-object-property! ,(car form) 'documentation ,docs))))) + (set-object-property! ,(car form) 'documentation ,docs))) + (define-macro (unless test . body) + `(if (not ,test) (begin ,@body))) + (export unless))) (define-macro-with-docs (define-with-docs name docs val) "Define @var{name} as @var{val}, documenting the value with -- 1.9.2 --MP_/IrJctxixHWzjc2SSI3jHCpo--