Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / define-music-types.scm

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index bec7bc5efcdea16691abb1879b2aad3f1c6fa84f..c421eefdf58690f562e9765d58e686441123e4df 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -283,14 +283,6 @@ e.g. @code{\\mark \"A\"}.")
 
        (types . (general-music mark-event event))
        ))
-    (ManualMelismaEvent
-     . (
-       (description .  "Start or stop a melisma.
-
-Syntax: @code{c4\\melisma d\\melismaEnd}.")
-       (types . (general-music melisma-span-event event))
-       ))
-
     (MultiMeasureRestMusic
      . (
        (description . "Rests that may be compressed into Multi rests. 
@@ -751,7 +743,7 @@ and values. E.g:
       (ly:error (_ "symbol expected: ~S") name))
   (let ((props (hashq-ref music-name-to-property-table name '())))
     (if (not (pair? props))
-       (ly:error (_ "can't find music object: ~S") name))
+       (ly:error (_ "cannot find music object: ~S") name))
     (let ((m (ly:make-music props)))
       (define (set-props mus-props)
        (if (and (not (null? mus-props))