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

Conflicts:
	ly/music-functions-init.ly

diff --cc ly/music-functions-init.ly
index 8ac1deda0113e19ca9676a17cbcf573d5e0eeb09,ad53afe592f626f3c0b092010846ca429ac8bac0..b96f90272fc8c2c4c8e4764679bcb27f7759e98a
--- 1/ly/music-functions-init.ly
--- 2/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@@ -360,7 -363,36 +360,6 @@@ label 
                                           'page-label label))))
  
  
 -language =
 -#(define-music-function (parser location str) (string?)
 -   (_i "Select note-names language.")
 -   ;; This function is a hack around the old language
 -   ;; selection system, using separate .ly files for each
 -   ;; supported languages.
 -   ;; TODO: re-implement language selection in a cleaner way.
 -   (let* ((file-name (string-append (string-downcase! str) ".ly"))
 -
 -        ; Ugh.  ly:gulp-file's "file not found" error message
 -        ; won't be much informative in this specific case.
 -        (raw-string (ly:gulp-file file-name))
 -
 -        ; extract the pitchnames alist.
 -        (delim-alist (string-match "`\\(.*\\)\\)\\s[ |\n]?\\)" raw-string ))
 -        (extract-alist (if delim-alist
 -                           (match:substring delim-alist)
 -                           #f)))
 -
 -     (if extract-alist
 -       (let ((lang-alist (eval-string extract-alist)))
 -         (if (ly:get-option 'verbose)
 -             (ly:message (_ "Using ~a note names...") str))
 -         (set! pitchnames lang-alist)
 -         (ly:parser-set-note-names parser lang-alist))
 -       (ly:error (_ "Cannot process ~a as a language file.
 -Use \\include \"~a\" instead.") file-name file-name))
 -     make-void-music))
 -
--
  makeClusters =
  #(define-music-function (parser location arg) (ly:music?)
     (_i "Display chords in @var{arg} as clusters.")