fixes.

[lilypond.git] / elisp / lilypond-mode.el

diff --git a/elisp/lilypond-mode.el b/elisp/lilypond-mode.el
index 17bca7a5992cd84a68cc5b1a8076a85697f91958..1c272c171c22a7aa6528615e115d448f5d04f407 100644 (file)
--- a/elisp/lilypond-mode.el
+++ b/elisp/lilypond-mode.el
@@ -411,11 +411,11 @@ in LilyPond-include-path."
   ;; Should expand this to include possible keyboard shortcuts which
   ;; could then be mapped to define-key and menu.
   `(
-    ("LilyPond" . ("lilypond-bin %s" "%s" "%l" "LaTeX"))
+    ("LilyPond" . ("lilypond %s" "%s" "%l" "ViewPS"))
     ("TeX" . ("tex '\\nonstopmode\\input %t'" "%t" "%d" "View"))
 
-    ("2Dvi" . ("lilypond %s" "%s" "%d" "View"))
-    ("2PS" . ("lilypond -P %s" "%s" "%p" "ViewPS"))
+    ("2Dvi" . ("lilypond -f tex %s" "%s" "%d" "LaTeX"))
+    ("2PS" . ("lilypond -f ps %s" "%s" "%p" "ViewPS"))
     ("2Midi" . ("lilypond -m %s" "%s" "%m" "Midi"))
 
     ("Book" . ("lilypond-book %x" "%x" "%l" "LaTeX"))
@@ -749,6 +749,7 @@ command."
   (define-key LilyPond-mode-map [(control c) return] 'LilyPond-command-current-midi)
   (define-key LilyPond-mode-map [(control c) (control return)] 'LilyPond-command-all-midi)
   (define-key LilyPond-mode-map "\C-x\C-s" 'LilyPond-save-buffer)
+  (define-key LilyPond-mode-map "\C-cb" 'LilyPond-what-beat)
   (define-key LilyPond-mode-map "\C-cf" 'font-lock-fontify-buffer)
   (define-key LilyPond-mode-map "\C-ci" 'LilyPond-insert-tag-current)
   ;; the following will should be overriden by Lilypond Quick Insert Mode
@@ -758,6 +759,7 @@ command."
   (define-key LilyPond-mode-map ">" 'LilyPond-electric-close-paren)
   (define-key LilyPond-mode-map "}" 'LilyPond-electric-close-paren)
   (define-key LilyPond-mode-map "]" 'LilyPond-electric-close-paren)
+  (define-key LilyPond-mode-map "|" 'LilyPond-electric-bar)
   (if (string-match "XEmacs\\|Lucid" emacs-version)
       (define-key LilyPond-mode-map [iso-left-tab] 'LilyPond-autocompletion)
     (define-key LilyPond-mode-map [iso-lefttab] 'LilyPond-autocompletion))
@@ -1172,14 +1174,14 @@ LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous"
 
 (load-library "lilypond-font-lock")
 (load-library "lilypond-indent")
-
+(load-library "lilypond-what-beat")
 
 (defun LilyPond-guile ()
   (interactive)
   (require 'ilisp)
   (guile "lilyguile" (LilyPond-command-expand (cadr (assoc "2Dvi" LilyPond-command-alist))
                                               (funcall 'LilyPond-get-master-file)))
-  (comint-default-send (ilisp-process) "(define-module (*anonymous-ly-1*))")
+  (comint-default-send (ilisp-process) "(define-module (*anonymous-ly-0*))")
   (comint-default-send (ilisp-process) "(set! %load-path (cons \"/usr/share/ilisp/\" %load-path))")
   (comint-default-send (ilisp-process) "(use-modules (guile-user) (guile-ilisp))")
   (comint-default-send (ilisp-process) "(newline)"))