diff options
| author | Ludovic Courtès | 2018-03-30 15:04:09 +0200 |
|---|---|---|
| committer | Ludovic Courtès | 2018-03-30 15:42:50 +0200 |
| commit | 6c7778dd9ec5e6cdc635238619dd18bfecfdf555 (patch) | |
| tree | df09548cc8d6185683d57e20ad0fcfb7479bc001 /src/guile/skribilo/ast.scm | |
| parent | c3d1019b8f2d5af0637ae2f055099e51b9706675 (diff) | |
| download | skribilo-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/ast.scm')
| -rw-r--r-- | src/guile/skribilo/ast.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/guile/skribilo/ast.scm b/src/guile/skribilo/ast.scm index e7a488a..524e654 100644 --- a/src/guile/skribilo/ast.scm +++ b/src/guile/skribilo/ast.scm @@ -2,7 +2,7 @@ ;;; ;;; Copyright 2003, 2004, 2009 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr> ;;; Copyright 2003, 2004 Manuel Serrano -;;; Copyright 2005, 2006, 2007, 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2007, 2012, 2013, 2015, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -136,21 +136,21 @@ (cond ((ast-orphan-error? c) (let ((node (ast-orphan-error:ast c))) (show-location node) - (format (current-error-port) (_ "orphan node: ~a~%") + (format (current-error-port) (G_ "orphan node: ~a~%") node))) ((ast-cycle-error? c) (let ((object (ast-cycle-error:object c))) (show-location object) (format (current-error-port) - (_ "cycle found in AST: ~a~%") object))) + (G_ "cycle found in AST: ~a~%") object))) ((markup-unknown-option-error? c) (let ((markup (markup-unknown-option-error:markup c)) (option (markup-unknown-option-error:option c))) (show-location markup) (format (current-error-port) - (_ "~a: unknown markup option for '~a'~%") + (G_ "~a: unknown markup option for '~a'~%") option markup))) ((markup-already-bound-error? c) @@ -158,7 +158,7 @@ (ident (markup-already-bound-error:ident c))) (show-location markup) (format (current-error-port) - (_ "'~a' (~a): markup identifier already bound~%") + (G_ "'~a' (~a): markup identifier already bound~%") ident (if (markup? markup) (markup-markup markup) @@ -166,7 +166,7 @@ (else (format (current-error-port) - (_ "undefined AST error: ~a~%") + (G_ "undefined AST error: ~a~%") c)))) (register-error-condition-handler! ast-error? handle-ast-error) |