From: hanwen Date: Mon, 6 Jan 2003 23:47:36 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/1.7.25~486 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=12b81f2c626d4ec79f92ff9cb7dc4358cb209cf5;p=lilypond.git *** empty log message *** --- diff --git a/lily/new-chord-name-engraver.cc b/lily/new-chord-name-engraver.cc index e0be6ccf72..a8277908e6 100644 --- a/lily/new-chord-name-engraver.cc +++ b/lily/new-chord-name-engraver.cc @@ -87,7 +87,7 @@ New_chord_name_engraver::process_music () chord_name_->set_grob_property("text", markup); announce_grob(chord_name_, SCM_EOL); SCM s = get_property ("chordChanges"); - if (to_boolean (s) && ly_car (last_chord_) != SCM_EOL + if (to_boolean (s) && gh_pair_p (last_chord_) && gh_equal_p (chord_as_scm, last_chord_)) chord_name_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T); diff --git a/python/lilylib.py b/python/lilylib.py index f33cb6bef1..3f0b0e7302 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -270,7 +270,12 @@ Exit status of CMD ''' exit_status = status >> 8 if status: - msg = _ ("`%s\' failed (%d)") % (name, exit_status) + + exit_type = 'status %d' % exit_status + if signal: + exit_type = 'signal %d' % signal + + msg = _ ("`%s\' failed (%s)") % (name, exit_type) if ignore_error: if __main__.verbose_p: warning (msg + ' ' + _ ("(ignored)"))