about summary refs log tree commit diff
path: root/src/guile/skribilo/utils/syntax.scm
diff options
context:
space:
mode:
authorLudovic Courtès2018-03-30 15:04:09 +0200
committerLudovic Courtès2018-03-30 15:42:50 +0200
commit6c7778dd9ec5e6cdc635238619dd18bfecfdf555 (patch)
treedf09548cc8d6185683d57e20ad0fcfb7479bc001 /src/guile/skribilo/utils/syntax.scm
parentc3d1019b8f2d5af0637ae2f055099e51b9706675 (diff)
downloadskribilo-6c7778dd9ec5e6cdc635238619dd18bfecfdf555.tar.gz
skribilo-6c7778dd9ec5e6cdc635238619dd18bfecfdf555.tar.lz
skribilo-6c7778dd9ec5e6cdc635238619dd18bfecfdf555.zip
syntax: Rename '_' to 'G_' to avoid issues on Guile 2.2.
Failing to do that, literal '_' would not match in contexts such as
'match' patterns on Guile 2.2.

* src/guile/skribilo/utils/syntax.scm (_): Rename to...
(G_): ... this.
* po/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* src/guile/skribilo.scm,
src/guile/skribilo/ast.scm,
src/guile/skribilo/biblio.scm,
src/guile/skribilo/biblio/author.scm,
src/guile/skribilo/condition.scm,
src/guile/skribilo/engine.scm,
src/guile/skribilo/engine/info.scm,
src/guile/skribilo/engine/lout.scm,
src/guile/skribilo/index.scm,
src/guile/skribilo/package/base.scm,
src/guile/skribilo/package/lncs.scm,
src/guile/skribilo/reader/rss-2.scm,
src/guile/skribilo/source.scm,
src/guile/skribilo/sui.scm,
src/guile/skribilo/biblio/template.scm,
src/guile/skribilo/verify.scm: Use 'G_' instead of '_'.
Diffstat (limited to 'src/guile/skribilo/utils/syntax.scm')
-rw-r--r--src/guile/skribilo/utils/syntax.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/guile/skribilo/utils/syntax.scm b/src/guile/skribilo/utils/syntax.scm
index 9477095..b6c93b4 100644
--- a/src/guile/skribilo/utils/syntax.scm
+++ b/src/guile/skribilo/utils/syntax.scm
@@ -1,7 +1,7 @@
 ;;; syntax.scm  --  Syntactic candy for Skribilo modules. -*- coding: utf-8 -*-
 ;;;
 ;;; Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-;;;   2012, 2016 Ludovic Courtès <ludo@gnu.org>
+;;;   2012, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;;
 ;;; This file is part of Skribilo.
@@ -28,7 +28,7 @@
            set-correct-file-encoding!
            default-to-utf-8
            %skribilo-text-domain
-           _ N_
+           G_ N_
            unwind-protect))
 
 ;;; Author:  Ludovic Courtès
@@ -54,7 +54,7 @@
 		     (if (string? file)
 			 (format #f "~a:~a:~a: " file line column)
 			 "")
-		     (_ "unexpected character in Skribilo module"))
+		     (G_ "unexpected character in Skribilo module"))
 		    chr)))
 
          (cond-expand
@@ -132,7 +132,7 @@
 
 (textdomain %skribilo-text-domain)
 
-(define (_ msg)
+(define (G_ msg)
   (gettext msg %skribilo-text-domain))
 
 (define (N_ msg msgplural n)