From: Patrick McCarty <pnorcks@gmail.com>
Date: Sun, 7 Mar 2010 01:28:59 +0000 (-0800)
Subject: Remove gettext wrappers for ancient Guile versions.
X-Git-Tag: release/2.13.16-1~31
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0394250509ea020b6c63eb752a060d8efcb7ccd5;p=lilypond.git

Remove gettext wrappers for ancient Guile versions.
---

diff --git a/scm/lily.scm b/scm/lily.scm
index bb7ce8f608..a17d6f03b2 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -254,10 +254,7 @@ messages into errors.")
 (if (memq (ly:get-option 'backend) music-string-to-path-backends)
     (ly:set-option 'music-strings-to-paths #t))
 
-;; gettext wrapper for guile < 1.7.2
-(if (defined? 'gettext)
-    (define-public _ gettext)
-    (define-public _ ly:gettext))
+(define-public _ gettext)
 
 (define-public (ly:load x)
   (let* ((file-name (%search-load-path x)))
diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 76773ab9ce..f25f8cb7ff 100644
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -27,10 +27,7 @@
  (lily)
  )
 
-;; gettext wrapper for guile < 1.7.2
-(if (defined? 'gettext)
-    (define-public _ gettext)
-    (define-public (_ x) x))
+(define-public _ gettext)
 
 (define PLATFORM
   (string->symbol
diff --git a/scripts/lilypond-invoke-editor.scm b/scripts/lilypond-invoke-editor.scm
index f8225db142..01e0408fd3 100644
--- a/scripts/lilypond-invoke-editor.scm
+++ b/scripts/lilypond-invoke-editor.scm
@@ -47,12 +47,7 @@
 	(format #f "~a/share/lilypond/~a"
 		prefix TOPLEVEL-VERSION))))
 
-
-
-;; gettext wrapper for guile < 1.7.2
-(if (defined? 'gettext)
-    (define-public _ gettext)
-    (define-public (_ x) x))
+(define-public _ gettext)
 
 (define (show-version port)
   (format port "~a (GNU LilyPond) ~a\n" PROGRAM-NAME TOPLEVEL-VERSION))