X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-invoke-editor.scm;h=6658f50166dfe4d98f56d2d2aad068d4e291f864;hb=HEAD;hp=0d8ca9ef52cc9714b6daf51b15994127bf6bf8e6;hpb=fe3687d66d2a768c83fede50ce901c6ef1b4969e;p=lilypond.git

diff --git a/scripts/lilypond-invoke-editor.scm b/scripts/lilypond-invoke-editor.scm
old mode 100755
new mode 100644
index 0d8ca9ef52..6658f50166
--- a/scripts/lilypond-invoke-editor.scm
+++ b/scripts/lilypond-invoke-editor.scm
@@ -1,10 +1,23 @@
 #!@GUILE@ -s
 !#
 ;;;; lilypond-invoke-editor.scm -- Invoke an editor in file:line:column mode
+
+;;;; Copyright (C) 2005--2015 Jan Nieuwenhuizen <janneke@gnu.org>
+
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; source file of the GNU LilyPond music typesetter
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
 ;;;;
-;;;; (c) 2005--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; gui debug helper
 ;; (define (exit x) (system "sleep 10"))
@@ -34,15 +47,10 @@
 	(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))
+  (format port "~a (GNU LilyPond) ~a\n" PROGRAM-NAME TOPLEVEL-VERSION))
 
 (define (show-help port)
   (format port (_ "Usage: lilypond-invoke-editor [textedit://]FILE:LINE:CHAR:COLUMN
@@ -81,7 +89,7 @@ Options:
 	  uri))
 
 (define (is-textedit-uri? uri)
-  (string-match "^textedit://" uri))
+  (string-match "^textedit:" uri))
   
   
 (define (dissect-uri uri)
@@ -121,30 +129,34 @@ Options:
 (define (run-browser uri)
   (system
    (if (getenv "BROWSER")
-       (format "~a ~a" (getenv "BROWSER") uri)
+       (format #f "~a ~a" (getenv "BROWSER") uri)
        (format #f "firefox -remote 'OpenURL(~a,new-tab)'" uri))))
 
 
 (define (strip-framework-path var)
   (define pat "lilypond/usr")
-  (let*
-      ((val (getenv var))
-       (paths (string-split val #\:))
-       (without (remove (lambda (s) (string-contains s pat))
-			paths)))
-
-    (if (not (= (length without)
-		(length paths)))
-	(setenv var (string-join without ":")))))
+  (if (getenv var)
+      (let*
+	  ((val (getenv var))
+	   (paths (string-split val #\:))
+	   (without (remove (lambda (s) (string-contains s pat))
+			    paths)))
+	
+	(if (not (= (length without)
+		    (length paths)))
+	    (setenv var (string-join without ":"))))))
 
 (define (main args)
   (let ((files (parse-options args)))
     (if (running-from-gui?)
 	(redirect-port (current-error-port)
 		       (open-file (string-append
-				   (or (getenv "TMP")
-				       (getenv "TEMP")
-				       "/tmp")
+                                   (if (string-match "^(Windows|CYGWIN)"
+                                                     (utsname:sysname (uname)))
+                                       (or (getenv "TMP")
+                                           (getenv "TEMP"))
+                                       (or (getenv "TMPDIR")
+                                           "/tmp"))
 				   "/lilypond-invoke-editor.log") "a")))
     (if (not (= (length files) 1))
 	(begin