r22668 - gnucash/trunk/src/app-utils - Drop syntax export of N_ and move related bits together

Geert Janssens gjanssens at code.gnucash.org
Tue Dec 18 05:25:38 EST 2012


Author: gjanssens
Date: 2012-12-18 05:25:38 -0500 (Tue, 18 Dec 2012)
New Revision: 22668
Trac: http://svn.gnucash.org/trac/changeset/22668

Modified:
   gnucash/trunk/src/app-utils/app-utils.scm
Log:
Drop syntax export of N_ and move related bits together

N_ gets defined in the root module, so it's automatically available
everywhere. Exporting it generated a a warning in guile 2.

Modified: gnucash/trunk/src/app-utils/app-utils.scm
===================================================================
--- gnucash/trunk/src/app-utils/app-utils.scm	2012-12-18 10:25:28 UTC (rev 22667)
+++ gnucash/trunk/src/app-utils/app-utils.scm	2012-12-18 10:25:38 UTC (rev 22668)
@@ -26,9 +26,6 @@
 
 ;; c-interface.scm
 (export gnc:error->string)
-(export gnc:gettext)
-(export _)
-(export-syntax N_)
 (export gnc:make-string-database)
 
 ;; options.scm
@@ -280,6 +277,12 @@
   (syntax-rules ()
     ((_ x) x)))
 
+(export gnc:gettext)
+(export _)
+
+(if (< (string->number (major-version)) 2)
+    (export-syntax N_))
+
 ;; A lot of Gnucash's code uses procedural interfaces to load modules.
 ;; This normally works, for procedures -- but for values that need to be
 ;; known at expand time, like macros, it doesn't work (in Guile 2.0 at



More information about the gnucash-changes mailing list