X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flily-parser.cc;h=2ee77b1e6dec7a0f270761362c642c37d792aaa0;hb=cf3642858a2340bb39ee56739f34c799946d4454;hp=e0722fd9800fbc9167c27abaaece0151a6be709d;hpb=d7c0f4263534307616c82d9b2ce6fdef9472456f;p=lilypond.git

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index e0722fd980..2ee77b1e6d 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -270,7 +270,7 @@ push_paper (Lily_parser *parser, Output_def *paper)
 void
 pop_paper (Lily_parser *parser)
 {
-  if (! scm_is_null (parser->lexer_->lookup_identifier ("$papers")))
+  if (scm_is_pair (parser->lexer_->lookup_identifier ("$papers")))
     parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
                                     scm_cdr (parser->lexer_->lookup_identifier ("$papers")));
 }