From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 25 Jul 2002 00:02:16 +0000 (+0000)
Subject: * lily/slur.cc (get_first_notecolumn_y): robustness: don't crash
X-Git-Tag: release/1.5.70~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8adca4c3e20f4663da5f9c8c887c8a3f2772bebf;p=lilypond.git

* lily/slur.cc (get_first_notecolumn_y): robustness: don't crash
if no note-columns.

* Documentation/user/refman.itely (Point and click):  updates.
(Graphical interfaces): add node
(Vertical spacing): add node
---

diff --git a/ChangeLog b/ChangeLog
index d7a8795864..0451f29dca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-07-25  Han-Wen  <hanwen@cs.uu.nl>
 
+	* lily/slur.cc (get_first_notecolumn_y): robustness: don't crash
+	if no note-columns.
+
 	* server.el.patch: new file.
 
 	* Documentation/user/refman.itely (Point and click):  updates.
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index e1066287e3..6c6f1e5c66 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -628,6 +628,7 @@ newer.  Enablle the menu Settings -> Inverse search.
 @item Emacs. Emacs is an extensible text-editor.  It is available from
 @uref{http://www.gnu.org/software/emacs/}.  You need version 21 to use
 column location.
+@item XEmacs. Xemacs is very similar to emacs.
 @item NEdit.  NEdit runs under Windows, and Unix.
   It is available from @uref{http://www.nedit.org}.
 @item GVim.  GVim is a lightweight GUI variant of VIM, the popular VI
@@ -666,10 +667,13 @@ Make sure that the environment variable @var{XEDITOR} is set to
 emacsclient --no-wait +%l %f
 @end example
 @cindex @var{XEDITOR}
-For using Vim, set @var{XEDITOR} to @code{gvim +%l %f}, or use this
+If you use xemacs instead of emacs, you use @code{(gnuserve-start)} in
+your @file{.emacs}, and set @code{XEDITOR} to @code{gnuclient -q +%l %f}
+
+For using Vim, set @code{XEDITOR} to @code{gvim +%l %f}, or use this
 argument with xdvi's @code{-editor} option.
 @cindex NEdit
-For using NEdit, set @var{XEDITOR} to @code{nc -noask +%l %f}, or
+For using NEdit, set @code{XEDITOR} to @code{nc -noask +%l %f}, or
 use this argument with xdvi's @code{-editor} option.
 
 If can also make your editor jump to the exact location of the note
@@ -682,7 +686,7 @@ line,
 #(set! point-and-click line-column-location)
 @end example
 @cindex line-colomn-location
-and set @var{XEDITOR} to @code{emacsclient --no-wait +%l:%c %f}.
+and set @code{XEDITOR} to @code{emacsclient --no-wait +%l:%c %f}.
 
 @refbugs
 
diff --git a/lily/slur.cc b/lily/slur.cc
index 424aa55765..bc7d291bf5 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -223,12 +223,19 @@ Slur::set_extremities (Grob *me)
 Real
 Slur::get_first_notecolumn_y (Grob *me, Direction dir)
 {
-  Grob *col = dir == LEFT
-    ? unsmob_grob (ly_car (scm_reverse (me->get_grob_property
- ("note-columns"))))
-    : unsmob_grob
- (ly_car (me->get_grob_property ("note-columns")));
+  SCM cols = me->get_grob_property ("note-columns");
+
+  if(!gh_pair_p (cols))
+    {
+      programming_error ("No note-columns in slur?");
+      me->suicide ();
+      return 0.0;
+    }
+  
+  if (dir == LEFT)
+    cols = scm_reverse(cols);
   
+  Grob *col = unsmob_grob (ly_car (cols));
   Grob *common[] =
   {
     0,