* scm/editor.scm (get-editor): Add platform defaults.

* scm/backend-library.scm (postscript->pdf): Typo.

diff --git a/ChangeLog b/ChangeLog
index 2c09fedc70c688248f2a0f269e9108b17fb1b0a6..50768b7a89d693258da8a85b3d84b9a8b6b170d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-17  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/editor.scm (get-editor): Add platform defaults.
+
+       * scm/backend-library.scm (postscript->pdf): Typo.
+
 2005-05-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/lily.scm (running-from-gui?): Darwin never runs from GUI.
@@ -6,7 +12,7 @@
 
 2005-05-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-       * lily/main.cc (setup_paths)[ARGV0_RELOCATION]: 
+       * lily/main.cc (setup_paths)[ARGV0_RELOCATION]: Remove GS_*.
 
 2005-05-16  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 

diff --git a/lily/main.cc b/lily/main.cc
index 32455ce104fb910fb65e6e56fc9a0f3626be9382..f2415d1fec3acf8cf64205e94ca0073cbaeff2cc 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -190,8 +190,6 @@ dir_info (FILE *out)
 #if ARGV0_RELOCATION
   env_var_info (out, "FONTCONFIG_FILE");
   env_var_info (out, "FONTCONFIG_PATH");
-  env_var_info (out, "GS_FONTPATH");
-  env_var_info (out, "GS_LIB");
   env_var_info (out, "GUILE_LOAD_PATH");
   env_var_info (out, "PANGO_RC_FILE");
   env_var_info (out, "PATH");
@@ -297,8 +295,10 @@ setup_paths (char const* argv0)
   String argv0_prefix = dir_name (bindir);
   if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory))))
     {
+#if 0
       warning (_f ("argv0 relocation: argv0=%s, prefix=%s", argv0,
                   prefix_directory));
+#endif
       String datadir = argv0_prefix + "/share";
       String libdir = argv0_prefix + "/lib";
       String sysconfdir = argv0_prefix + "/etc";
@@ -308,14 +308,6 @@ setup_paths (char const* argv0)
       prepend_env_path ("GUILE_LOAD_PATH", datadir
                        + to_string ("/guile/%d.%d",
                                     SCM_MAJOR_VERSION, SCM_MINOR_VERSION));
-#ifdef __MINGW32__
-      /* FIXME: this is broken and must go, but updating the environment
-        takes a relogin/reboot.  Can gs be wrapped?  */
-      prepend_env_path ("GS_FONTPATH", "c:/windows/fonts");
-#endif
-      prepend_env_path ("GS_FONTPATH", datadir + "/gs/fonts");
-      prepend_env_path ("GS_LIB", datadir + "/gs/Resource");
-      prepend_env_path ("GS_LIB", datadir + "/gs/lib");
       sane_putenv ("PANGO_RC_FILE", sysconfdir + "/pango/pango.modules", false);
       prepend_env_path ("PATH", bindir);
     }

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 74e53693594a9c836aed76fbd10a5768a2c3428a..e200b2dd4ad8a0f715d126f73546863a893ca9ca 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -53,7 +53,7 @@
     ;; The wrapper on windows cannot handle `=' signs,
     ;; gs has a workaround with #.
     (if (eq? PLATFORM 'windows)
-       (set! cmd (string-regex-substitute "=" "#" cmd)))
+       (set! cmd (string-regexp-substitute "=" "#" cmd)))
 
     (if (access? pdf-name W_OK)
        (delete-file pdf-name))

diff --git a/scm/editor.scm b/scm/editor.scm
index 047d9af7a2f46a8dd2c87d7ecf3b12b64cf21b10..2491e0c4cad452315eb186484d52f05a232b73ae 100644 (file)
--- a/scm/editor.scm
+++ b/scm/editor.scm
@@ -21,7 +21,13 @@
   (or (getenv "LYEDITOR")
       (getenv "XEDITOR")
       (getenv "EDITOR")
-      "emacs"))
+
+      ;; FIXME: how are default/preferred editors specified on
+      ;; different platforms?
+      (case PLATFORM
+       ((windows) "lilypad")
+       (else
+        "emacs"))))
 
 (define (get-command-template alist editor)
   (define (get-command-template-helper)