From eead5632e5cab6115ed1751e8a2231670e5e0be4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 17 May 2005 14:36:20 +0000 Subject: [PATCH] * scm/editor.scm (get-editor): Add platform defaults. * scm/backend-library.scm (postscript->pdf): Typo. --- ChangeLog | 8 +++++++- lily/main.cc | 12 ++---------- scm/backend-library.scm | 2 +- scm/editor.scm | 8 +++++++- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c09fedc70..50768b7a89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-05-17 Jan Nieuwenhuizen + + * scm/editor.scm (get-editor): Add platform defaults. + + * scm/backend-library.scm (postscript->pdf): Typo. + 2005-05-17 Han-Wen Nienhuys * scm/lily.scm (running-from-gui?): Darwin never runs from GUI. @@ -6,7 +12,7 @@ 2005-05-16 Jan Nieuwenhuizen - * lily/main.cc (setup_paths)[ARGV0_RELOCATION]: + * lily/main.cc (setup_paths)[ARGV0_RELOCATION]: Remove GS_*. 2005-05-16 Mats Bengtsson diff --git a/lily/main.cc b/lily/main.cc index 32455ce104..f2415d1fec 100644 --- 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 74e5369359..e200b2dd4a 100644 --- 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 047d9af7a2..2491e0c4ca 100644 --- 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) -- 2.39.5